Completed
Push — 1.10.x ( c135db...ea3352 )
by Julito
26:21
created
main/newscorm/openoffice_text_document.class.php 3 patches
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 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)
@@ -164,6 +165,7 @@  discard block
 block discarded – undo
164 165
      * Manages page splitting
165 166
      * @param	string	Page header
166 167
      * @param	string	Page body
168
+     * @param string $body
167 169
      * @return	void
168 170
      */
169 171
     function dealPerPage($header, $body)
Please login to merge, or discard this patch.
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.
main/newscorm/resourcelinker.inc.php 4 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -320,6 +320,10 @@
 block discarded – undo
320 320
  * @param icon        - if ="icon" then the small icon will appear
321 321
  *                      if ="wrap" then wrapped settings are used (and no icon is displayed)
322 322
  *                      if ="nolink" then only the name is returned with no href and no icon (note:only in this case, the result is not displayed, but returned)
323
+ * @param string $completed
324
+ * @param string $id_in_path
325
+ * @param string $builder
326
+ * @param string $icon
323 327
  * @todo this function is too long, rewrite
324 328
  */
325 329
 function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0) {
Please login to merge, or discard this patch.
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -286,14 +286,14 @@  discard block
 block discarded – undo
286 286
             $ext = strtolower($ext[sizeof($ext)-1]);
287 287
             $myrow['path'] = rawurlencode($myrow['path']);
288 288
 
289
-			$array_ext=array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png');
289
+            $array_ext=array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png');
290 290
 
291
-			if (api_browser_support('svg')){
292
-				$array_ext[]='svg';
293
-			}
294
-			if (api_browser_support('ogg')){
295
-				$array_ext[]='ogg';
296
-			}
291
+            if (api_browser_support('svg')){
292
+                $array_ext[]='svg';
293
+            }
294
+            if (api_browser_support('ogg')){
295
+                $array_ext[]='ogg';
296
+            }
297 297
 
298 298
             $in_frames = in_array($ext, $array_ext);
299 299
 
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
             $result = Database::query($sql);
393 393
             $row = Database::fetch_array($result);
394 394
             if ($row['title'] != '') {
395
-                 $myrow['content'] = $row['title'];
395
+                    $myrow['content'] = $row['title'];
396 396
             }
397 397
             $desc = $row['description'];
398 398
             $ann_id = $row['item_id'];
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
             if ($icon == 'nolink') { return(shorten($myrow['title'], $length)); }
470 470
             if ($icon == 'icon') {
471 471
                 if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
472
-                   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
472
+                    else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
473 473
             }
474 474
             $thelink = $myrow['url'];
475 475
             if ($builder != 'builder') {
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
             $myrow = Database::fetch_array($result);
495 495
 
496 496
             if ($builder == 'builder') { $origin = 'builder'; }
497
-              // This is needed for the exercise_submit.php can delete the session info about tests.
497
+                // This is needed for the exercise_submit.php can delete the session info about tests.
498 498
 
499 499
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
500 500
             $result = Database::query($sql);
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
             $name = GetQuizName($path, $documentPath);
547 547
 
548 548
             if ($builder == 'builder') { $origin='builder'; }
549
-              // This is needed for the exercise_submit.php can delete the session info about tests.
549
+                // This is needed for the exercise_submit.php can delete the session info about tests.
550 550
 
551 551
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
552 552
             $result = Database::query($sql);	$row = Database::fetch_array($result);
@@ -1106,7 +1106,7 @@  discard block
 block discarded – undo
1106 1106
             $myrow = Database::fetch_array($result);
1107 1107
 
1108 1108
             if ($builder == 'builder') { $origin = 'builder'; }
1109
-              // This is needed for the exercise_submit.php can delete the session info about tests.
1109
+                // This is needed for the exercise_submit.php can delete the session info about tests.
1110 1110
 
1111 1111
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
1112 1112
             $result = Database::query($sql);	$row = Database::fetch_array($result);
@@ -1330,10 +1330,10 @@  discard block
 block discarded – undo
1330 1330
  */
1331 1331
 function delete_all_resources_type($type)
1332 1332
 {
1333
-  $course_id = api_get_course_int_id();
1334
-  $TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
1335
-  $sql = "DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type'";
1336
-  Database::query($sql);
1333
+    $course_id = api_get_course_int_id();
1334
+    $TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
1335
+    $sql = "DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type'";
1336
+    Database::query($sql);
1337 1337
 }
1338 1338
 
1339 1339
 /**
Please login to merge, or discard this patch.
Braces   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -334,9 +334,14 @@  discard block
 block discarded – undo
334 334
 
335 335
     $length = ((($builder == 'builder') && ($icon == 'nolink')) ? 65 : 32);
336 336
 
337
-    if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
337
+    if ($builder != 'builder') {
338
+        $origin = 'learnpath';
339
+    }
340
+    //origin = learnpath in student view
338 341
     $linktype = $type;
339
-    if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
342
+    if (($type == 'Link _self') or ($type == 'Link _blank')) {
343
+        $type = 'Link';
344
+    }
340 345
 
341 346
     // YW switched litteral tool names to use of constants declared in main_api.lib.php
342 347
     switch ($type) {
@@ -356,7 +361,7 @@  discard block
 block discarded – undo
356 361
             if ($icon != 'nolink') {
357 362
                 if ($completed == 'completed') {
358 363
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
359
-                }	else {
364
+                } else {
360 365
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
361 366
                     //echo "&nbsp;";
362 367
                 }
@@ -407,7 +412,7 @@  discard block
 block discarded – undo
407 412
             if ($icon != 'nolink') {
408 413
                 if ($completed == 'completed') {
409 414
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
410
-                }	else {
415
+                } else {
411 416
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
412 417
                     //echo "&nbsp;";
413 418
                 }
@@ -454,7 +459,7 @@  discard block
 block discarded – undo
454 459
             if ($icon != 'nolink') {
455 460
                 if ($completed == 'completed') {
456 461
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
457
-                }	else {
462
+                } else {
458 463
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
459 464
                     //echo "&nbsp;";
460 465
                 }
@@ -468,8 +473,7 @@  discard block
 block discarded – undo
468 473
 
469 474
             if ($icon == 'nolink') { return(shorten($myrow['title'], $length)); }
470 475
             if ($icon == 'icon') {
471
-                if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
472
-                   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
476
+                if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; } else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
473 477
             }
474 478
             $thelink = $myrow['url'];
475 479
             if ($builder != 'builder') {
@@ -558,7 +562,7 @@  discard block
 block discarded – undo
558 562
             if ($icon != 'nolink') {
559 563
                 if ($completed == 'completed') {
560 564
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
561
-                }	else {
565
+                } else {
562 566
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
563 567
                     //echo "&nbsp;";
564 568
                 }
@@ -603,7 +607,7 @@  discard block
 block discarded – undo
603 607
             if ($icon != 'nolink') {
604 608
                 if ($completed == 'completed') {
605 609
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
606
-                }	else {
610
+                } else {
607 611
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
608 612
                     //echo "&nbsp;";
609 613
                 }
@@ -647,7 +651,7 @@  discard block
 block discarded – undo
647 651
             if ($icon != 'nolink') {
648 652
                 if ($completed == 'completed') {
649 653
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
650
-                }	else {
654
+                } else {
651 655
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
652 656
                     //echo "&nbsp;";
653 657
                 }
@@ -698,7 +702,7 @@  discard block
 block discarded – undo
698 702
             if ($icon != 'nolink') {
699 703
                 if ($completed == 'completed') {
700 704
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
701
-                }	else {
705
+                } else {
702 706
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
703 707
                     //echo "&nbsp;";
704 708
                 }
@@ -801,7 +805,7 @@  discard block
 block discarded – undo
801 805
             if ($icon != 'nolink') {
802 806
                 if ($completed == 'completed') {
803 807
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
804
-                }	else {
808
+                } else {
805 809
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
806 810
                     //echo "&nbsp;";
807 811
                 }
@@ -842,7 +846,7 @@  discard block
 block discarded – undo
842 846
             if ($icon != 'nolink') {
843 847
                 if ($completed == 'completed') {
844 848
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
845
-                }	else {
849
+                } else {
846 850
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
847 851
                     //echo "&nbsp;";
848 852
                 }
@@ -858,8 +862,7 @@  discard block
 block discarded – undo
858 862
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
859 863
                 if ($desc != '') {
860 864
                     if ($icon != 'wrap') {
861
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
862
-                    else {
865
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
863 866
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
864 867
                 }
865 868
             } else {
@@ -897,8 +900,7 @@  discard block
 block discarded – undo
897 900
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
898 901
                 if ($desc != '') {
899 902
                     if ($icon != 'wrap') {
900
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
901
-                    else {
903
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
902 904
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
903 905
                 }
904 906
             } else {
@@ -920,7 +922,7 @@  discard block
 block discarded – undo
920 922
             if ($icon != 'nolink') {
921 923
                 if ($completed == 'completed') {
922 924
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
923
-                }	else {
925
+                } else {
924 926
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
925 927
                     //echo "&nbsp;";
926 928
                 }
@@ -936,8 +938,7 @@  discard block
 block discarded – undo
936 938
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
937 939
                 if ($desc != '') {
938 940
                     if ($icon != 'wrap') {
939
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
940
-                    else {
941
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
941 942
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
942 943
                 }
943 944
             } else {
@@ -976,8 +977,7 @@  discard block
 block discarded – undo
976 977
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
977 978
                 if ($desc != '') {
978 979
                     if ($icon != 'wrap') {
979
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
980
-                    else {
980
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
981 981
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
982 982
                 }
983 983
             } else {
@@ -1015,8 +1015,7 @@  discard block
 block discarded – undo
1015 1015
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1016 1016
                 if ($desc != '') {
1017 1017
                     if ($icon != 'wrap') {
1018
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
1019
-                    else {
1018
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
1020 1019
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
1021 1020
                 }
1022 1021
             } else {
@@ -1346,11 +1345,12 @@  discard block
 block discarded – undo
1346 1345
             WHERE c_id = $course_id AND source_type='$type' and source_id='$id'";
1347 1346
     $result = Database::query($sql);
1348 1347
     $number_added = Database::num_rows($result);
1349
-    if ($number_added != 0)
1350
-        return true;
1351
-    else
1352
-        return false;
1353
-}
1348
+    if ($number_added != 0) {
1349
+            return true;
1350
+    } else {
1351
+            return false;
1352
+    }
1353
+    }
1354 1354
 
1355 1355
 /**
1356 1356
  * this function is to load the resources that were added to a specific item
@@ -1459,8 +1459,7 @@  discard block
 block discarded – undo
1459 1459
             next($addedresource);
1460 1460
         }
1461 1461
         echo '</table>';
1462
-    }
1463
-    else { // it is a string
1462
+    } else { // it is a string
1464 1463
         echo '';
1465 1464
     }
1466 1465
 } // end of the display_resources function
@@ -1492,8 +1491,7 @@  discard block
 block discarded – undo
1492 1491
                 echo "<a href='".api_get_self()."?content=".$type."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&lp_id=$learnpath_id&parent_item_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
1493 1492
             }
1494 1493
         }
1495
-    }
1496
-    else { // if it is not an array, it is a string
1494
+    } else { // if it is not an array, it is a string
1497 1495
         if ($_SESSION['addedresource'] !== $type || $_SESSION['addedresourceid'] !== $id) {
1498 1496
             if ($from_learnpath) { $lang_add_it_or_resource = get_lang('AddIt'); } else { $lang_add_it_or_resource = get_lang('AddResource'); }
1499 1497
             echo "<a href='".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&lp_id=$learnpath_id&parent_item_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
@@ -1519,7 +1517,9 @@  discard block
 block discarded – undo
1519 1517
     $course_id = api_get_course_int_id();
1520 1518
 
1521 1519
     // Styling the link of the added resource
1522
-    if ($style != '') $styling = ' class="'.$style.'"';
1520
+    if ($style != '') {
1521
+        $styling = ' class="'.$style.'"';
1522
+    }
1523 1523
     if ($new_window) { $target = ' target = "_blank" '; } else { $target = ' target = "_self" '; }
1524 1524
 
1525 1525
     $output = '';
Please login to merge, or discard this patch.
Spacing   +169 added lines, -169 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 $use_anonymous = true;
18 18
 
19 19
 require_once '../inc/global.inc.php';
20
-if (!empty($_course['language'])){
21
-    $resource_linker_file =  api_get_path(SYS_CODE_PATH).'lang/'.$_course['language'].'/resourcelinker.inc.php';
20
+if (!empty($_course['language'])) {
21
+    $resource_linker_file = api_get_path(SYS_CODE_PATH).'lang/'.$_course['language'].'/resourcelinker.inc.php';
22 22
     if (file_exists($resource_linker_file)) {
23 23
         require_once $resource_linker_file;
24 24
     }
@@ -47,11 +47,11 @@  discard block
 block discarded – undo
47 47
         echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
48 48
     }
49 49
     if ($level && $level != 0 && $level != 1) {
50
-        $folder_up=$folder;
51
-        $folder_temp=explode('/',$folder);
52
-        $last=count($folder_temp)-1;
50
+        $folder_up = $folder;
51
+        $folder_temp = explode('/', $folder);
52
+        $last = count($folder_temp) - 1;
53 53
         unset($folder_temp[$last]);
54
-        $folder_up=implode('/',$folder_temp);
54
+        $folder_up = implode('/', $folder_temp);
55 55
         echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;folder=$folder_up&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
56 56
     }
57 57
 }
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     $result = Database::query($sql);
89 89
     while ($row = Database::fetch_array($result)) {
90 90
         if (!$folder) {
91
-            if (get_levels($row['path'])-1 == 1) {
91
+            if (get_levels($row['path']) - 1 == 1) {
92 92
                 // showing the right icon.
93 93
                 if (file_or_folder($row['path'])) {
94 94
                         echo '<img src="../img/file.gif" align="middle" />';
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
                     echo "&folder=".substr($row['path'], 1)."&source_id=$source_id&source_forum=".$_GET['source_forum']."&action=$action&lp_id=$learnpath_id&parent_item_id=$chapter_id&originalresource=no'>".substr($row['path'], 1).'</a><br />';
104 104
                 } else {
105 105
                     echo substr($row['path'], 1).' ';
106
-                    echo showorhide_addresourcelink('Document',$row['id']);
106
+                    echo showorhide_addresourcelink('Document', $row['id']);
107 107
                     echo '<br />';
108 108
                 }
109 109
             }
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
             $level = get_levels($folder) + 1;
114 114
 
115 115
             // We calculate each level of the database entry.
116
-            $file_level=get_levels($row['path'])-1;
116
+            $file_level = get_levels($row['path']) - 1;
117 117
             // If the level of the database entry is equal to the level we ar in, we put it into an array
118 118
             // as this is a potential good entry.
119 119
             if ($file_level == $level) {
@@ -191,14 +191,14 @@  discard block
 block discarded – undo
191 191
     $addedresourceid = $_SESSION['addedresourceid'];
192 192
     if ($_SESSION['addedresource']) {
193 193
         foreach ($addedresource as $resource_type) {
194
-            $sql="INSERT INTO $resource_table (c_id, source_type, source_id, resource_type, resource_id) VALUES
194
+            $sql = "INSERT INTO $resource_table (c_id, source_type, source_id, resource_type, resource_id) VALUES
195 195
             ($course_id, '$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
196 196
             Database::query($sql);
197
-            $i=key($addedresource);
197
+            $i = key($addedresource);
198 198
             next($addedresource);
199 199
         }
200
-        $_SESSION['addedresource']='';
201
-        $_SESSION['addedresourceid']='';
200
+        $_SESSION['addedresource'] = '';
201
+        $_SESSION['addedresourceid'] = '';
202 202
     }
203 203
 }
204 204
 
@@ -278,21 +278,21 @@  discard block
 block discarded – undo
278 278
             $dbTable = Database::get_course_table(TABLE_DOCUMENT);
279 279
             $result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
280 280
             $myrow = Database::fetch_array($result);
281
-            $pathname = explode('/',$myrow['path']); // Making a correct name for the link.
282
-            $last = count($pathname) - 1;  // Making a correct name for the link.
283
-            $filename = $pathname[$last];  // Making a correct name for the link.
281
+            $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
282
+            $last = count($pathname) - 1; // Making a correct name for the link.
283
+            $filename = $pathname[$last]; // Making a correct name for the link.
284 284
             $image = choose_image($filename);
285 285
             $ext = explode('.', $filename);
286
-            $ext = strtolower($ext[sizeof($ext)-1]);
286
+            $ext = strtolower($ext[sizeof($ext) - 1]);
287 287
             $myrow['path'] = rawurlencode($myrow['path']);
288 288
 
289
-			$array_ext=array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png');
289
+			$array_ext = array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png');
290 290
 
291
-			if (api_browser_support('svg')){
292
-				$array_ext[]='svg';
291
+			if (api_browser_support('svg')) {
292
+				$array_ext[] = 'svg';
293 293
 			}
294
-			if (api_browser_support('ogg')){
295
-				$array_ext[]='ogg';
294
+			if (api_browser_support('ogg')) {
295
+				$array_ext[] = 'ogg';
296 296
 			}
297 297
 
298 298
             $in_frames = in_array($ext, $array_ext);
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 
335 335
     $length = ((($builder == 'builder') && ($icon == 'nolink')) ? 65 : 32);
336 336
 
337
-    if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
337
+    if ($builder != 'builder') $origin = 'learnpath'; //origin = learnpath in student view
338 338
     $linktype = $type;
339 339
     if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
340 340
 
@@ -342,12 +342,12 @@  discard block
 block discarded – undo
342 342
     switch ($type) {
343 343
         case TOOL_CALENDAR_EVENT:
344 344
         case 'Agenda':
345
-            $TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);
345
+            $TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
346 346
             $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE c_id = $course_id AND id=$id");
347 347
             $myrow = Database::fetch_array($result);
348 348
 
349 349
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
350
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
350
+            $result = Database::query($sql); $row = Database::fetch_array($result);
351 351
             if ($row['title'] != '') { $myrow['title'] = $row['title']; }
352 352
             $desc = $row['description'];
353 353
             $agenda_id = $row['item_id'];
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
             if ($icon != 'nolink') {
357 357
                 if ($completed == 'completed') {
358 358
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
359
-                }	else {
359
+                } else {
360 360
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
361 361
                     //echo "&nbsp;";
362 362
                 }
@@ -368,17 +368,17 @@  discard block
 block discarded – undo
368 368
             if ($icon == 'nolink') { return(shorten($myrow['title'], $length)); }
369 369
             if ($icon == 'icon') { echo "<img src='../img/agenda.gif' align=\"absmiddle\" alt='agenda'>"; }
370 370
             if ($builder != 'builder') {
371
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length-3*$level))."</a>";
371
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
372 372
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
373 373
                 if ($desc != '') {
374 374
                     if ($icon != 'wrap') {
375
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
375
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
376 376
                     } else {
377
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
377
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
378 378
                     }
379 379
                 }
380 380
             } else {
381
-                echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length-3*$level))."</a>";
381
+                echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
382 382
             }
383 383
             break;
384 384
 
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
             if ($icon != 'nolink') {
408 408
                 if ($completed == 'completed') {
409 409
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
410
-                }	else {
410
+                } else {
411 411
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
412 412
                     //echo "&nbsp;";
413 413
                 }
@@ -420,26 +420,26 @@  discard block
 block discarded – undo
420 420
                 return(true);
421 421
             }
422 422
 
423
-            if ($icon == 'nolink') { return(shorten($title,$length)); }
423
+            if ($icon == 'nolink') { return(shorten($title, $length)); }
424 424
             if ($icon == 'icon') { echo "<img src='../img/valves.gif' align=\"absmiddle\" alt='ad valvas'>"; }
425 425
             if ($builder != 'builder') {
426
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title, ($length-3*$level))."</a>";
426
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title, ($length - 3 * $level))."</a>";
427 427
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
428 428
                 if ($desc != '') {
429 429
                     if ($icon != 'wrap') {
430
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
430
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
431 431
                     } else {
432
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
432
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
433 433
                     }
434 434
                 }
435 435
             } else {
436
-                echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title, ($length-3*$level))."</a>";
436
+                echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title, ($length - 3 * $level))."</a>";
437 437
             }
438 438
             break;
439 439
 
440 440
         case TOOL_LINK:
441 441
         case 'Link':
442
-            $TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
442
+            $TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
443 443
             $result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
444 444
             $myrow = Database::fetch_array($result);
445 445
 
@@ -447,14 +447,14 @@  discard block
 block discarded – undo
447 447
             $result = Database::query($sql);
448 448
             $row = Database::fetch_array($result);
449 449
             if ($row['title'] != '') { $myrow['title'] = $row['title']; }
450
-            $desc=$row['description'];
450
+            $desc = $row['description'];
451 451
             echo str_repeat("&nbsp;&gt;", $level);
452 452
 
453 453
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "<td>"; }
454 454
             if ($icon != 'nolink') {
455 455
                 if ($completed == 'completed') {
456 456
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
457
-                }	else {
457
+                } else {
458 458
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
459 459
                     //echo "&nbsp;";
460 460
                 }
@@ -473,23 +473,23 @@  discard block
 block discarded – undo
473 473
             }
474 474
             $thelink = $myrow['url'];
475 475
             if ($builder != 'builder') {
476
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length-3*$level))."</a>";
477
-                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
476
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
477
+                $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
478 478
                 if ($desc != '') {
479 479
                     if ($icon != 'wrap') {
480
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
480
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
481 481
                     } else {
482
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
482
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
483 483
                     }
484 484
                 }
485 485
             } else {
486
-                echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length-3*$level))."</a>";
486
+                echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
487 487
             }
488 488
             break;
489 489
 
490 490
         case TOOL_QUIZ:
491 491
         case 'Exercise':
492
-            $TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
492
+            $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
493 493
             $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id");
494 494
             $myrow = Database::fetch_array($result);
495 495
 
@@ -522,35 +522,35 @@  discard block
 block discarded – undo
522 522
             if ($icon == 'nolink') { return(shorten($myrow['title'], $length)); }
523 523
             if ($icon == 'icon') { echo "<img src='../img/quiz.gif' align=\"absmiddle\" alt='quizz'>"; }
524 524
             if ($builder != 'builder') {
525
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length-3*$level))."</a>";
525
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
526 526
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
527 527
                 if ($desc != '') {
528 528
                     if ($icon != 'wrap') {
529
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
529
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
530 530
                     } else {
531
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
531
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
532 532
                     }
533 533
                 }
534 534
             } else {
535
-                echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow['id']."\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length-3*$level))."</a>";
535
+                echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow['id']."\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
536 536
             }
537 537
             break;
538 538
 
539 539
         case 'hotpotatoes':
540 540
         case 'HotPotatoes':
541
-            $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
541
+            $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
542 542
             $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
543 543
             $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE c_id = $course_id AND id=$id");
544 544
             $myrow = Database::fetch_array($result);
545 545
             $path = $myrow['path'];
546 546
             $name = GetQuizName($path, $documentPath);
547 547
 
548
-            if ($builder == 'builder') { $origin='builder'; }
548
+            if ($builder == 'builder') { $origin = 'builder'; }
549 549
               // This is needed for the exercise_submit.php can delete the session info about tests.
550 550
 
551 551
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
552
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
553
-            if ($row['title'] != '') { $name=$row['title']; }
552
+            $result = Database::query($sql); $row = Database::fetch_array($result);
553
+            if ($row['title'] != '') { $name = $row['title']; }
554 554
             $desc = $row['description'];
555 555
             echo str_repeat("&nbsp;&gt;", $level);
556 556
 
@@ -558,32 +558,32 @@  discard block
 block discarded – undo
558 558
             if ($icon != 'nolink') {
559 559
                 if ($completed == 'completed') {
560 560
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
561
-                }	else {
561
+                } else {
562 562
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
563 563
                     //echo "&nbsp;";
564 564
                 }
565 565
             }
566 566
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
567 567
 
568
-            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
568
+            if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
569 569
 
570
-            if ($icon == 'nolink') { return(shorten($name,$length)); }
570
+            if ($icon == 'nolink') { return(shorten($name, $length)); }
571 571
             if ($icon == 'icon') { echo "<img src='../img/jqz.jpg' align=\"absmiddle\" alt='hot potatoes'>"; }
572 572
 
573 573
             $cid = $_course['official_code'];
574 574
 
575 575
             if ($builder != 'builder') {
576
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
576
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>";
577 577
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
578 578
                 if ($desc != '') {
579 579
                     if ($icon != 'wrap') {
580
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
580
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
581 581
                     } else {
582
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
582
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
583 583
                     }
584 584
                 }
585 585
             } else {
586
-                echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
586
+                echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
587 587
             }
588 588
             break;
589 589
 
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
             $myrow = Database::fetch_array($result);
595 595
 
596 596
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
597
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
597
+            $result = Database::query($sql); $row = Database::fetch_array($result);
598 598
             if ($row['title'] != '') { $myrow["forum_name"] = $row['title']; }
599 599
             $desc = $row['description'];
600 600
             echo str_repeat("&nbsp;&gt;", $level);
@@ -603,30 +603,30 @@  discard block
 block discarded – undo
603 603
             if ($icon != 'nolink') {
604 604
                 if ($completed == 'completed') {
605 605
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
606
-                }	else {
606
+                } else {
607 607
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
608 608
                     //echo "&nbsp;";
609 609
                 }
610 610
             }
611 611
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
612 612
 
613
-            if ($myrow["forum_name"]=='') { $type="Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
613
+            if ($myrow["forum_name"] == '') { $type = "Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
614 614
 
615 615
             if ($icon == 'nolink') { return(shorten($myrow['forum_name'], $length)); }
616 616
             if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
617 617
             $forumparameters = "forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
618 618
             if ($builder != 'builder') {
619
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
619
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"], ($length - 3 * $level))."</a>";
620 620
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
621 621
                 if ($desc != '') {
622 622
                     if ($icon != 'wrap') {
623
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
623
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
624 624
                     } else {
625
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
625
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
626 626
                     }
627 627
                 }
628 628
             } else {
629
-                echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
629
+                echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"], ($length - 3 * $level))."</a>";
630 630
             }
631 631
             break;
632 632
 
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
             $myrow = Database::fetch_array($result);
639 639
 
640 640
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
641
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
641
+            $result = Database::query($sql); $row = Database::fetch_array($result);
642 642
             if ($row['title'] != '') { $myrow['topic_title'] = $row['title']; }
643 643
             $desc = $row['description'];
644 644
             echo str_repeat("&nbsp;&gt;", $level);
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
             if ($icon != 'nolink') {
648 648
                 if ($completed == 'completed') {
649 649
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
650
-                }	else {
650
+                } else {
651 651
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
652 652
                     //echo "&nbsp;";
653 653
                 }
@@ -659,17 +659,17 @@  discard block
 block discarded – undo
659 659
             if ($icon == 'nolink') { return(shorten($myrow['topic_title'], $length)); }
660 660
             if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
661 661
             if ($builder != 'builder') {
662
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"], ($length-3*$level))."</a>";
662
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"], ($length - 3 * $level))."</a>";
663 663
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
664 664
                 if ($desc != '') {
665 665
                     if ($icon != 'wrap') {
666
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
666
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
667 667
                     } else {
668
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
668
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
669 669
                     }
670 670
                 }
671 671
             } else {
672
-                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
672
+                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"], ($length - 3 * $level))."</a>";
673 673
             }
674 674
             break;
675 675
 
@@ -684,13 +684,13 @@  discard block
 block discarded – undo
684 684
 
685 685
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
686 686
             $result = Database::query($sql);
687
-            $row=Database::fetch_array($result);
687
+            $row = Database::fetch_array($result);
688 688
             if ($row['title'] != '') { $myrow['post_title'] = $row['title']; }
689 689
             $desc = $row['description'];
690 690
             echo str_repeat("&nbsp;&gt;", $level);
691 691
 
692
-            $posternom = $myrow['nom'];				$posterprenom = $myrow['prenom'];
693
-            $posttime = $myrow['post_time'];			$posttext = $myrow['post_text'];
692
+            $posternom = $myrow['nom']; $posterprenom = $myrow['prenom'];
693
+            $posttime = $myrow['post_time']; $posttext = $myrow['post_text'];
694 694
             $posttitle = $myrow['post_title'];
695 695
             $posttext = str_replace('"', "'", $posttext);
696 696
 
@@ -698,7 +698,7 @@  discard block
 block discarded – undo
698 698
             if ($icon != 'nolink') {
699 699
                 if ($completed == 'completed') {
700 700
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
701
-                }	else {
701
+                } else {
702 702
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
703 703
                     //echo "&nbsp;";
704 704
                 }
@@ -710,19 +710,19 @@  discard block
 block discarded – undo
710 710
                 echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
711 711
             }
712 712
 
713
-            if ($icon == 'nolink') { return(shorten($myrow["post_title"],$length)); }
713
+            if ($icon == 'nolink') { return(shorten($myrow["post_title"], $length)); }
714 714
             if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
715 715
             if ($builder != 'builder') {
716
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".intval($_GET['source_forum'])."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow["post_title"],($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".intval($_GET['source_forum'])."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
716
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".intval($_GET['source_forum'])."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow["post_title"], ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".intval($_GET['source_forum'])."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
717 717
                 if ($desc != '') {
718 718
                     if ($icon != 'wrap') {
719
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
719
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
720 720
                     } else {
721
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
721
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
722 722
                     }
723 723
                 }
724 724
             } else {
725
-                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["post_title"],($length-3*$level))."</a>";
725
+                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["post_title"], ($length - 3 * $level))."</a>";
726 726
             }
727 727
             break;
728 728
 
@@ -735,14 +735,14 @@  discard block
 block discarded – undo
735 735
             $myrow = Database::fetch_array($result);
736 736
 
737 737
             $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
738
-            $last = count($pathname) - 1;  // Making a correct name for the link.
739
-            $filename=$pathname[$last];  // Making a correct name for the link.
738
+            $last = count($pathname) - 1; // Making a correct name for the link.
739
+            $filename = $pathname[$last]; // Making a correct name for the link.
740 740
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "<td>"; }
741 741
 
742 742
             echo str_repeat("&nbsp;&gt;", $level);
743 743
 
744 744
             if ($icon != 'nolink') {
745
-                if ($completed=='completed') {
745
+                if ($completed == 'completed') {
746 746
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
747 747
                 } else {
748 748
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
@@ -754,9 +754,9 @@  discard block
 block discarded – undo
754 754
 
755 755
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
756 756
             //error_log('New LP - Querying lp_item table: '.$sql, 0);
757
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
757
+            $result = Database::query($sql); $row = Database::fetch_array($result);
758 758
             if ($row['title'] != '') { $filename = $row['title']; }
759
-            $desc=$row['description'];
759
+            $desc = $row['description'];
760 760
 
761 761
             if (($myrow['path'] == '') && ($filename == '')) {
762 762
                 echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
@@ -767,22 +767,22 @@  discard block
 block discarded – undo
767 767
             if ($icon == 'icon') { echo "<img src='../img/$image' align=\"absmiddle\" alt='$image'>"; }
768 768
             if ($builder != 'builder')
769 769
             {
770
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename,($length-3*$level))."</a>";
770
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename, ($length - 3 * $level))."</a>";
771 771
                 if ($desc != '') {
772 772
                     if ($icon != 'wrap') {
773
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
773
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
774 774
                     } else {
775
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
775
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
776 776
                     }
777 777
                 } $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
778 778
             } else {
779
-                $enableDocumentParsing=yes;
779
+                $enableDocumentParsing = yes;
780 780
                 if (!$enableDocumentParsing) {
781 781
                     // This is the solution for the non-parsing version in the builder.
782 782
                     $file = urlencode($myrow['path']);
783
-                    echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
783
+                    echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename, ($length - 3 * $level))."</a>";
784 784
                 } else {
785
-                    echo "<a href=\"../document/download.php?doc_url=".$myrow['path']."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
785
+                    echo "<a href=\"../document/download.php?doc_url=".$myrow['path']."\" class='$completed' $hyperlink_target_parameter>".shorten($filename, ($length - 3 * $level))."</a>";
786 786
                 }
787 787
             }
788 788
             break;
@@ -793,7 +793,7 @@  discard block
 block discarded – undo
793 793
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
794 794
             $result = Database::query($sql);
795 795
             $row = Database::fetch_array($result);
796
-            if ($row['title'] != '') { $name=$row['title']; }
796
+            if ($row['title'] != '') { $name = $row['title']; }
797 797
             $desc = $row['description'];
798 798
             echo str_repeat("&nbsp;&gt;", $level);
799 799
 
@@ -801,30 +801,30 @@  discard block
 block discarded – undo
801 801
             if ($icon != 'nolink') {
802 802
                 if ($completed == 'completed') {
803 803
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
804
-                }	else {
804
+                } else {
805 805
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
806 806
                     //echo "&nbsp;";
807 807
                 }
808 808
             }
809 809
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
810 810
 
811
-            if ($name=='') {
811
+            if ($name == '') {
812 812
                 echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
813 813
             }
814 814
 
815 815
             if ($icon == 'nolink') { return(shorten($name, $length)); }
816 816
             if ($icon == 'icon') { echo "<img src='../img/works.gif' align=\"absmiddle\">"; }
817 817
             if ($builder != 'builder') {
818
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
818
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
819 819
                 if ($desc != '') {
820 820
                     if ($icon != 'wrap') {
821
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
821
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
822 822
                     } else {
823
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
823
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
824 824
                     }
825 825
                 }
826 826
             } else {
827
-                echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
827
+                echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
828 828
             }
829 829
             break;
830 830
 
@@ -842,7 +842,7 @@  discard block
 block discarded – undo
842 842
             if ($icon != 'nolink') {
843 843
                 if ($completed == 'completed') {
844 844
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
845
-                }	else {
845
+                } else {
846 846
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
847 847
                     //echo "&nbsp;";
848 848
                 }
@@ -855,15 +855,15 @@  discard block
 block discarded – undo
855 855
             if ($icon == 'icon') { echo "<img src='../img/dropbox.gif' align=\"absmiddle\">"; }
856 856
 
857 857
             if ($builder != 'builder') {
858
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
858
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
859 859
                 if ($desc != '') {
860 860
                     if ($icon != 'wrap') {
861
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
861
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
862 862
                     else {
863
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
863
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
864 864
                 }
865 865
             } else {
866
-                echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
866
+                echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
867 867
             }
868 868
             break;
869 869
 
@@ -871,7 +871,7 @@  discard block
 block discarded – undo
871 871
         case 'Introduction_text':
872 872
             $name = get_lang('IntroductionText');
873 873
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
874
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
874
+            $result = Database::query($sql); $row = Database::fetch_array($result);
875 875
             if ($row['title'] != '') { $name = $row['title']; }
876 876
             $desc = $row['description'];
877 877
             echo str_repeat("&nbsp;&gt;", $level);
@@ -893,17 +893,17 @@  discard block
 block discarded – undo
893 893
             if ($icon == 'icon') { echo "<img src='../img/introduction.gif' align=\"absmiddle\" alt='introduction'>"; }
894 894
 
895 895
             if ($builder != 'builder') {
896
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
896
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>";
897 897
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
898 898
                 if ($desc != '') {
899 899
                     if ($icon != 'wrap') {
900
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
900
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
901 901
                     else {
902
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
902
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
903 903
                 }
904 904
             } else {
905 905
                 $s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
906
-                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
906
+                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
907 907
             }
908 908
             break;
909 909
 
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
911 911
         case 'Course_description':
912 912
             $name = get_lang('CourseDescription');
913 913
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
914
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
914
+            $result = Database::query($sql); $row = Database::fetch_array($result);
915 915
             if ($row['title'] != '') { $name = $row['title']; }
916 916
             $desc = $row['description'];
917 917
             echo str_repeat("&nbsp;&gt;", $level);
@@ -920,7 +920,7 @@  discard block
 block discarded – undo
920 920
             if ($icon != 'nolink') {
921 921
                 if ($completed == 'completed') {
922 922
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
923
-                }	else {
923
+                } else {
924 924
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
925 925
                     //echo "&nbsp;";
926 926
                 }
@@ -929,20 +929,20 @@  discard block
 block discarded – undo
929 929
 
930 930
             if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
931 931
 
932
-            if ($icon == 'nolink') { return(shorten($name,$length)); }
932
+            if ($icon == 'nolink') { return(shorten($name, $length)); }
933 933
             if ($icon == 'icon') { echo "<img src='../img/info.gif' align=\"absmiddle\" alt='info'>"; }
934 934
 
935 935
             if ($builder != 'builder') {
936
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
936
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
937 937
                 if ($desc != '') {
938 938
                     if ($icon != 'wrap') {
939
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
939
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
940 940
                     else {
941
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
941
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
942 942
                 }
943 943
             } else {
944
-                $s=api_get_path(WEB_CODE_PATH)."course_description";
945
-                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
944
+                $s = api_get_path(WEB_CODE_PATH)."course_description";
945
+                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
946 946
             }
947 947
             break;
948 948
 
@@ -952,7 +952,7 @@  discard block
 block discarded – undo
952 952
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
953 953
             $result = Database::query($sql);
954 954
             $row = Database::fetch_array($result);
955
-            if ($row['title'] != '') { $name=$row['title']; }
955
+            if ($row['title'] != '') { $name = $row['title']; }
956 956
             $desc = $row['description'];
957 957
             echo str_repeat("&nbsp;&gt;", $level);
958 958
 
@@ -967,21 +967,21 @@  discard block
 block discarded – undo
967 967
             }
968 968
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
969 969
 
970
-            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
970
+            if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
971 971
 
972 972
             if ($icon == 'nolink') { return(shorten($name, $length)); }
973 973
             if ($icon == 'icon') { echo "<img src='../img/group.gif' align=\"absmiddle\" alt='group'>"; }
974 974
 
975 975
             if ($builder != 'builder') {
976
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
976
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
977 977
                 if ($desc != '') {
978 978
                     if ($icon != 'wrap') {
979
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
979
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
980 980
                     else {
981
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
981
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
982 982
                 }
983 983
             } else {
984
-                echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
984
+                echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
985 985
             }
986 986
             break;
987 987
 
@@ -1006,21 +1006,21 @@  discard block
 block discarded – undo
1006 1006
             }
1007 1007
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
1008 1008
 
1009
-            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1009
+            if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1010 1010
 
1011
-            if ($icon == 'nolink') { return(shorten($name,$length)); }
1011
+            if ($icon == 'nolink') { return(shorten($name, $length)); }
1012 1012
             if ($icon == 'icon') { echo "<img src='../img/members.gif' align=\"absmiddle\" alt='members'>"; }
1013 1013
 
1014 1014
             if ($builder != 'builder') {
1015
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1015
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1016 1016
                 if ($desc != '') {
1017 1017
                     if ($icon != 'wrap') {
1018
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
1018
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
1019 1019
                     else {
1020
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
1020
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
1021 1021
                 }
1022 1022
             } else {
1023
-                echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
1023
+                echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
1024 1024
             }
1025 1025
             break;
1026 1026
     }//end huge switch-statement
@@ -1059,7 +1059,7 @@  discard block
 block discarded – undo
1059 1059
             $myrow = Database::fetch_array($result);
1060 1060
 
1061 1061
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
1062
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
1062
+            $result = Database::query($sql); $row = Database::fetch_array($result);
1063 1063
             if ($row['title'] != '') { $myrow['title'] = $row['title']; }
1064 1064
             $desc = $row['description'];
1065 1065
             $agenda_id = $row['item_id'];
@@ -1084,7 +1084,7 @@  discard block
 block discarded – undo
1084 1084
             break;
1085 1085
 
1086 1086
         case 'Link':
1087
-            $TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
1087
+            $TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
1088 1088
             $result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
1089 1089
             $myrow = Database::fetch_array($result);
1090 1090
 
@@ -1101,7 +1101,7 @@  discard block
 block discarded – undo
1101 1101
             break;
1102 1102
 
1103 1103
         case 'Exercise':
1104
-            $TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
1104
+            $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
1105 1105
             $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id");
1106 1106
             $myrow = Database::fetch_array($result);
1107 1107
 
@@ -1109,7 +1109,7 @@  discard block
 block discarded – undo
1109 1109
               // This is needed for the exercise_submit.php can delete the session info about tests.
1110 1110
 
1111 1111
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
1112
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
1112
+            $result = Database::query($sql); $row = Database::fetch_array($result);
1113 1113
             if ($row['title'] != '') { $myrow['title'] = $row['title']; }
1114 1114
 
1115 1115
             if ($builder != 'builder') {
@@ -1119,7 +1119,7 @@  discard block
 block discarded – undo
1119 1119
             }
1120 1120
             break;
1121 1121
         case 'HotPotatoes':
1122
-            $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
1122
+            $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
1123 1123
             $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
1124 1124
             $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE c_id = $course_id AND id=$id");
1125 1125
             $myrow = Database::fetch_array($result);
@@ -1137,14 +1137,14 @@  discard block
 block discarded – undo
1137 1137
             break;
1138 1138
         case 'Forum':
1139 1139
             //deprecated
1140
-            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);  // TODO: This is the old table name, it should be corrected.
1140
+            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM); // TODO: This is the old table name, it should be corrected.
1141 1141
             $result = Database::query("SELECT * FROM $TBL_FORUMS WHERE c_id = $course_id AND forum_id=$id");
1142 1142
             $myrow = Database::fetch_array($result);
1143 1143
 
1144 1144
             if ($builder == 'builder') { $origin = 'builder'; }
1145 1145
 
1146 1146
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
1147
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
1147
+            $result = Database::query($sql); $row = Database::fetch_array($result);
1148 1148
             if ($row['title'] != '') { $myrow['forum_name'] = $row['title']; }
1149 1149
 
1150 1150
             if ($myrow['forum_name'] == '') { $type = 'Forum'; }
@@ -1167,7 +1167,7 @@  discard block
 block discarded – undo
1167 1167
             $myrow = Database::fetch_array($result);
1168 1168
 
1169 1169
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
1170
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
1170
+            $result = Database::query($sql); $row = Database::fetch_array($result);
1171 1171
 
1172 1172
             if ($builder != 'builder') {
1173 1173
                 $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
@@ -1191,8 +1191,8 @@  discard block
 block discarded – undo
1191 1191
             $desc = $row['description'];
1192 1192
             //$link .= str_repeat("&nbsp;&gt;", $level);
1193 1193
 
1194
-            $posternom = $myrow['nom'];				$posterprenom = $myrow['prenom'];
1195
-            $posttime = $myrow['post_time'];		$posttext = $myrow['post_text'];
1194
+            $posternom = $myrow['nom']; $posterprenom = $myrow['prenom'];
1195
+            $posttime = $myrow['post_time']; $posttext = $myrow['post_text'];
1196 1196
             $posttitle = $myrow['post_title'];
1197 1197
             $posttext = str_replace('"', "'", $posttext);
1198 1198
 
@@ -1209,8 +1209,8 @@  discard block
 block discarded – undo
1209 1209
             $myrow = Database::fetch_array($result);
1210 1210
 
1211 1211
             $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
1212
-            $last = count($pathname) - 1;  // Making a correct name for the link.
1213
-            $filename = $pathname[$last];  // Making a correct name for the link.
1212
+            $last = count($pathname) - 1; // Making a correct name for the link.
1213
+            $filename = $pathname[$last]; // Making a correct name for the link.
1214 1214
 
1215 1215
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
1216 1216
             $result = Database::query($sql);
@@ -1288,7 +1288,7 @@  discard block
 block discarded – undo
1288 1288
     unset($addedresource[$resource_key]);
1289 1289
     unset($addedresourceid[$resource_key]);
1290 1290
     $_SESSION['addedresource'] = $addedresource;
1291
-    $_SESSION['addedresourceid'] = $addedresourceid ;
1291
+    $_SESSION['addedresourceid'] = $addedresourceid;
1292 1292
 }
1293 1293
 
1294 1294
 /**
@@ -1363,11 +1363,11 @@  discard block
 block discarded – undo
1363 1363
 
1364 1364
     $sql = "SELECT * FROM $TABLERESOURCE
1365 1365
             WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
1366
-    $result=Database::query($sql);
1367
-    while ($row=Database::fetch_array($result))
1366
+    $result = Database::query($sql);
1367
+    while ($row = Database::fetch_array($result))
1368 1368
     {
1369
-        $addedresource[]=$row["resource_type"];
1370
-        $addedresourceid[]=$row["resource_id"];
1369
+        $addedresource[] = $row["resource_type"];
1370
+        $addedresourceid[] = $row["resource_id"];
1371 1371
     }
1372 1372
     $_SESSION['addedresource'] = $addedresource;
1373 1373
     $_SESSION['addedresourceid'] = $addedresourceid;
@@ -1413,11 +1413,11 @@  discard block
 block discarded – undo
1413 1413
 
1414 1414
     $sql = "SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id='$id'";
1415 1415
     $result = Database::query($sql);
1416
-    while ($row=Database::fetch_array($result)) {
1416
+    while ($row = Database::fetch_array($result)) {
1417 1417
         if ($origin != 'learnpath') {
1418
-            display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
1418
+            display_addedresource_link($row['resource_type'], $row['resource_id'], $style);
1419 1419
         } else {
1420
-            display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
1420
+            display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'], 'agendaitems', '', 'builder', 'icon'); echo "<br>";
1421 1421
         }
1422 1422
     }
1423 1423
 }
@@ -1479,7 +1479,7 @@  discard block
 block discarded – undo
1479 1479
 
1480 1480
     if (is_array($_SESSION['addedresource'])) {
1481 1481
         foreach ($addedresource as $toolcompare) {
1482
-            if ($toolcompare==$type && $addedresourceid[key($addedresource)] == $id) {
1482
+            if ($toolcompare == $type && $addedresourceid[key($addedresource)] == $id) {
1483 1483
                 $show = 0;
1484 1484
             }
1485 1485
             next($addedresource);
@@ -1513,7 +1513,7 @@  discard block
 block discarded – undo
1513 1513
  * @param boolean	Open in a new window (true) or in the current frame/window (false)?
1514 1514
  * @todo use the constants for the type definitions.
1515 1515
  */
1516
-function rl_get_html_resource_link($course_code, $type, $id, $style='', $new_window = true) {
1516
+function rl_get_html_resource_link($course_code, $type, $id, $style = '', $new_window = true) {
1517 1517
     $_course = api_get_course_info($course_code);
1518 1518
 
1519 1519
     $course_id = api_get_course_int_id();
@@ -1559,7 +1559,7 @@  discard block
 block discarded – undo
1559 1559
         case TOOL_THREAD:  //=topics
1560 1560
             //$tbl_forum 		= Database::get_course_table(TABLE_FORUM);
1561 1561
             //$tbl_thread 	= Database::get_course_table(TABLE_FORUM_THREAD);
1562
-            $tbl_post 		= Database::get_course_table(TABLE_FORUM_POST);
1562
+            $tbl_post = Database::get_course_table(TABLE_FORUM_POST);
1563 1563
             // grabbing the title of the post
1564 1564
             $sql_title = "SELECT * FROM $tbl_post WHERE c_id = $course_id AND post_id=".$id;
1565 1565
             $result_title = Database::query($sql_title);
@@ -1579,8 +1579,8 @@  discard block
 block discarded – undo
1579 1579
             $result = Database::query("SELECT * FROM $tbl_doc WHERE c_id = $course_id AND id=$id");
1580 1580
             $myrow = Database::fetch_array($result);
1581 1581
             $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
1582
-            $last = count($pathname) - 1;  // Making a correct name for the link.
1583
-            $filename = $pathname[$last];  // Making a correct name for the link.
1582
+            $last = count($pathname) - 1; // Making a correct name for the link.
1583
+            $filename = $pathname[$last]; // Making a correct name for the link.
1584 1584
             $image = choose_image($filename);
1585 1585
             $ext = explode('.', $filename);
1586 1586
             $ext = strtolower($ext[sizeof($ext) - 1]);
@@ -1656,8 +1656,8 @@  discard block
 block discarded – undo
1656 1656
             if (!empty($id)) {
1657 1657
                 $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
1658 1658
                 $sql = "SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id";
1659
-                $result= Database::query($sql);
1660
-                $myrow=Database::fetch_array($result);
1659
+                $result = Database::query($sql);
1660
+                $myrow = Database::fetch_array($result);
1661 1661
                 if ($row_item['title'] != '') {
1662 1662
                     $myrow['title'] = $row_item['title'];
1663 1663
                 }
@@ -1669,8 +1669,8 @@  discard block
 block discarded – undo
1669 1669
             $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE c_id = $course_id AND id=$id");
1670 1670
             $myrow = Database::fetch_array($result);
1671 1671
             $path = $myrow['path'];
1672
-            $link .= $main_dir_path.'exercice/showinframes.php?file='.$path.'' .
1673
-                    '&origin='.$origin.'&cid='.$course_code.'&uid='.api_get_user_id().'' .
1672
+            $link .= $main_dir_path.'exercice/showinframes.php?file='.$path.''.
1673
+                    '&origin='.$origin.'&cid='.$course_code.'&uid='.api_get_user_id().''.
1674 1674
                     '&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$id_in_path.'&lp_view_id='.$lpViewId;
1675 1675
             break;
1676 1676
         case TOOL_FORUM:
@@ -1682,7 +1682,7 @@  discard block
 block discarded – undo
1682 1682
                 $sql = "SELECT * FROM $tbl_topics WHERE c_id = $course_id AND thread_id=$id";
1683 1683
                 $result = Database::query($sql);
1684 1684
                 $myrow = Database::fetch_array($result);
1685
-                $link .= $main_dir_path.'forum/viewthread.php?origin=learnpath&thread='.$id.'' .
1685
+                $link .= $main_dir_path.'forum/viewthread.php?origin=learnpath&thread='.$id.''.
1686 1686
                         '&forum='.$myrow['forum_id'].'&lp=true';
1687 1687
             }
1688 1688
             break;
@@ -1698,14 +1698,14 @@  discard block
 block discarded – undo
1698 1698
             $posttitle = $title;
1699 1699
             $posttext = str_replace('"', "'", $posttext);
1700 1700
 
1701
-            $link .= $main_dir_path.'forum/viewthread.php?post='.$id.'' .
1702
-                    '&thread='.$myrow['thread_id'].'&forum='.$myrow['forum_id'].'' .
1701
+            $link .= $main_dir_path.'forum/viewthread.php?post='.$id.''.
1702
+                    '&thread='.$myrow['thread_id'].'&forum='.$myrow['forum_id'].''.
1703 1703
                     '&lp=true';
1704 1704
             break;
1705 1705
         case TOOL_DOCUMENT:
1706 1706
             $document = $em
1707 1707
                 ->getRepository('ChamiloCourseBundle:CDocument')
1708
-                ->findOneBy(['cId' => $course_id,  'id' => $id]);
1708
+                ->findOneBy(['cId' => $course_id, 'id' => $id]);
1709 1709
 
1710 1710
             if (!$document) {
1711 1711
                 break;
@@ -1717,9 +1717,9 @@  discard block
 block discarded – undo
1717 1717
             $showDirectUrl = !in_array($extension, $jplayer_supported_files);
1718 1718
 
1719 1719
             if ($showDirectUrl) {
1720
-                $link = $main_course_path . 'document' . $document->getPath() . '?' . api_get_cidreq();
1720
+                $link = $main_course_path.'document'.$document->getPath().'?'.api_get_cidreq();
1721 1721
             } else {
1722
-                $link = api_get_path(WEB_CODE_PATH) . 'document/showinframes.php?' . http_build_query([
1722
+                $link = api_get_path(WEB_CODE_PATH).'document/showinframes.php?'.http_build_query([
1723 1723
                     'cidReq' => $course_code,
1724 1724
                     'id' => $id,
1725 1725
                     'origin' => 'learnpathitem'
@@ -1728,8 +1728,8 @@  discard block
 block discarded – undo
1728 1728
 
1729 1729
             $openmethod = 2;
1730 1730
             $officedoc = false;
1731
-            Session::write('openmethod',$openmethod);
1732
-            Session::write('officedoc',$officedoc);
1731
+            Session::write('openmethod', $openmethod);
1732
+            Session::write('officedoc', $officedoc);
1733 1733
             break;
1734 1734
         case TOOL_LP_FINAL_ITEM:
1735 1735
             $link .= api_get_path(WEB_CODE_PATH).'newscorm/lp_final_item.php?'.api_get_cidreq().'&id='.$id.'&lp_id='.$learnpath_id;
@@ -1856,8 +1856,8 @@  discard block
 block discarded – undo
1856 1856
             $result = Database::query("SELECT * FROM $tbl_doc WHERE c_id = $course_id AND id=$id");
1857 1857
             $myrow = Database::fetch_array($result);
1858 1858
             $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
1859
-            $last = count($pathname) - 1;  // Making a correct name for the link.
1860
-            $filename = $pathname[$last];  // Making a correct name for the link.
1859
+            $last = count($pathname) - 1; // Making a correct name for the link.
1860
+            $filename = $pathname[$last]; // Making a correct name for the link.
1861 1861
             $image = choose_image($filename);
1862 1862
             $ext = explode('.', $filename);
1863 1863
             $ext = strtolower($ext[sizeof($ext) - 1]);
Please login to merge, or discard this patch.
main/newscorm/scorm.class.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
      * @param int $userMaxScore
272 272
      * @param int $sessionId
273 273
      *
274
-     * @return bool	Returns -1 on error
274
+     * @return boolean|null	Returns -1 on error
275 275
      */
276 276
     public function import_manifest($courseCode, $userMaxScore = 1, $sessionId = 0, $userId = 0)
277 277
     {
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
      * @param	string	course Code
926 926
      * @param string	LP ID (in database)
927 927
      * @param string	Manifest file path (optional if lp_id defined)
928
-     * @return	integer	New LP ID or false on failure
928
+     * @return	boolean	New LP ID or false on failure
929 929
      * TODO @TODO Implement imsmanifest_path parameter
930 930
      */
931 931
     public function reimport_manifest($courseCode, $lp_id = null, $imsmanifest_path = '')
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
                 $path = '';
394 394
                 $type = 'dir';
395 395
                 if (isset($this->resources[$item['identifierref']])) {
396
-                    $oRes =& $this->resources[$item['identifierref']];
396
+                    $oRes = & $this->resources[$item['identifierref']];
397 397
                     $path = @$oRes->get_path();
398 398
                     if (!empty($path)) {
399 399
                         $temptype = $oRes->get_scorm_type();
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
                 $item['parameters'] = Database::escape_string($item['parameters']);
445 445
 
446 446
                 $sql = "INSERT INTO $new_lp_item (c_id, lp_id,item_type,ref,title, path,min_score,max_score, $field_add parent_item_id,previous_item_id,next_item_id, prerequisite,display_order,launch_data, parameters)
447
-                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'] .", '".$item['datafromlms']."', '".$item['parameters']."' )";
447
+                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'].", '".$item['datafromlms']."', '".$item['parameters']."' )";
448 448
 
449 449
                 Database::query($sql);
450 450
                 if ($this->debug > 1) { error_log('New LP - In import_manifest(), inserting item : '.$sql, 0); }
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
                     foreach ($specific_fields as $specific_field) {
479 479
                         if (isset($_REQUEST[$specific_field['code']])) {
480 480
                             $sterms = trim($_REQUEST[$specific_field['code']]);
481
-                            $all_specific_terms .= ' '. $sterms;
481
+                            $all_specific_terms .= ' '.$sterms;
482 482
                             if (!empty($sterms)) {
483 483
                                 $sterms = explode(',', $sterms);
484 484
                                 foreach ($sterms as $sterm) {
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
                             }
488 488
                         }
489 489
                     }
490
-                    $body_to_index = $all_specific_terms .' '. $title;
490
+                    $body_to_index = $all_specific_terms.' '.$title;
491 491
                     $ic_slide->addValue("content", $body_to_index);
492 492
                     // TODO: Add a comment to say terms separated by commas.
493 493
                     $courseid = api_get_course_id();
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
                         SE_COURSE_ID => $courseid,
498 498
                         SE_TOOL_ID => TOOL_LEARNPATH,
499 499
                         SE_DATA => array('lp_id' => $lp_id, 'lp_item'=> $previous, 'document_id' => ''), // TODO: Unify with other lp types.
500
-                        SE_USER => (int)api_get_user_id(),
500
+                        SE_USER => (int) api_get_user_id(),
501 501
                     );
502 502
                     $ic_slide->xapian_data = serialize($xapian_data);
503 503
                     $di->addChunk($ic_slide);
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
543 543
     public function import_package($zip_file_info, $current_dir = '', $courseInfo = array())
544 544
     {
545 545
         if ($this->debug > 0) {
546
-            error_log('In scorm::import_package('.print_r($zip_file_info,true).',"'.$current_dir.'") method', 0);
546
+            error_log('In scorm::import_package('.print_r($zip_file_info, true).',"'.$current_dir.'") method', 0);
547 547
         }
548 548
 
549 549
         $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
         $zip_file_name = $zip_file_info['name'];
555 555
 
556 556
         if ($this->debug > 1) {
557
-            error_log('New LP - import_package() - zip file path = ' . $zip_file_path . ', zip file name = ' . $zip_file_name, 0);
557
+            error_log('New LP - import_package() - zip file path = '.$zip_file_path.', zip file name = '.$zip_file_name, 0);
558 558
         }
559 559
 
560 560
         $course_rel_dir = api_get_course_path($courseInfo['code']).'/scorm'; // scorm dir web path starting from /courses
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
         $current_dir = api_replace_dangerous_char(trim($current_dir)); // Current dir we are in, inside scorm/
563 563
 
564 564
         if ($this->debug > 1) {
565
-            error_log( 'New LP - import_package() - current_dir = ' . $current_dir, 0);
565
+            error_log('New LP - import_package() - current_dir = '.$current_dir, 0);
566 566
         }
567 567
 
568 568
         // Get name of the zip file without the extension.
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
         $file_info = pathinfo($zip_file_name);
571 571
         $filename = $file_info['basename'];
572 572
         $extension = $file_info['extension'];
573
-        $file_base_name = str_replace('.'.$extension,'',$filename); // Filename without its extension.
573
+        $file_base_name = str_replace('.'.$extension, '', $filename); // Filename without its extension.
574 574
         $this->zipname = $file_base_name; // Save for later in case we don't have a title.
575 575
 
576 576
         if ($this->debug > 1) { error_log("New LP - base file name is : ".$file_base_name, 0); }
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
         $slash_count = substr_count($shortest_path, '/');
617 617
         foreach ($manifest_list as $manifest_path) {
618 618
             $tmp_slash_count = substr_count($manifest_path, '/');
619
-            if ($tmp_slash_count<$slash_count) {
619
+            if ($tmp_slash_count < $slash_count) {
620 620
                 $shortest_path = $manifest_path;
621 621
                 $slash_count = $tmp_slash_count;
622 622
             }
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
         $this->subdir .= '/'.dirname($shortest_path); // Do not concatenate because already done above.
626 626
         $manifest = $shortest_path;
627 627
         if ($this->debug > 1) { error_log('New LP - Package type is now '.$package_type, 0); }
628
-        if ($package_type== '') {
628
+        if ($package_type == '') {
629 629
             // && defined('CHECK_FOR_SCORM') && CHECK_FOR_SCORM)
630 630
             if ($this->debug > 1) { error_log('New LP - Package type is empty', 0); }
631 631
             return api_failure::set_failure('not_scorm_content');
@@ -641,8 +641,8 @@  discard block
 block discarded – undo
641 641
             $new_dir = '/'.$new_dir;
642 642
         }
643 643
 
644
-        if ($new_dir[strlen($new_dir)-1] == '/') {
645
-            $new_dir = substr($new_dir,0,-1);
644
+        if ($new_dir[strlen($new_dir) - 1] == '/') {
645
+            $new_dir = substr($new_dir, 0, -1);
646 646
         }
647 647
 
648 648
         /* Uncompressing phase */
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
                     if ($file != '.' && $file != '..') {
684 684
                         $filetype = 'file';
685 685
 
686
-                        if (is_dir($course_sys_dir . $new_dir . $file)) {
686
+                        if (is_dir($course_sys_dir.$new_dir.$file)) {
687 687
                             $filetype = 'folder';
688 688
                         }
689 689
 
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
712 712
                                     }
713 713
                                 }
714 714
                             }
715
-                            @rename($course_sys_dir.$new_dir.$file,$course_sys_dir.$new_dir.$safe_file);
715
+                            @rename($course_sys_dir.$new_dir.$file, $course_sys_dir.$new_dir.$safe_file);
716 716
                             if ($this->debug >= 1) { error_log('New LP - Renaming '.$course_sys_dir.$new_dir.$file.' to '.$course_sys_dir.$new_dir.$safe_file, 0); }
717 717
                         }
718 718
                     }
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
         if ($this->debug > 0) { error_log('In scorm::get_res_path('.$id.') method', 0); }
902 902
         $path = '';
903 903
         if (isset($this->resources[$id])) {
904
-            $oRes =& $this->resources[$id];
904
+            $oRes = & $this->resources[$id];
905 905
             $path = @$oRes->get_path();
906 906
         }
907 907
         return $path;
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
917 917
         if ($this->debug > 0) { error_log('In scorm::get_res_type('.$id.') method', 0); }
918 918
         $type = '';
919 919
         if (isset($this->resources[$id])) {
920
-            $oRes =& $this->resources[$id];
920
+            $oRes = & $this->resources[$id];
921 921
             $temptype = $oRes->get_scorm_type();
922 922
             if (!empty($temptype)) {
923 923
                 $type = $temptype;
@@ -936,9 +936,9 @@  discard block
 block discarded – undo
936 936
         $title = '';
937 937
         if (isset($this->manifest['organizations']['default'])) {
938 938
             $title = $this->organizations[$this->manifest['organizations']['default']]->get_name();
939
-        } elseif (count($this->organizations)==1) {
939
+        } elseif (count($this->organizations) == 1) {
940 940
             // This will only get one title but so we don't need to know the index.
941
-            foreach($this->organizations as $id => $value) {
941
+            foreach ($this->organizations as $id => $value) {
942 942
                 $title = $this->organizations[$id]->get_name();
943 943
                 break;
944 944
             }
Please login to merge, or discard this patch.
main/permissions/permissions_functions.inc.php 4 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
 /**
120 120
 * This function retrieves the existing permissions of a user, group or role.
121
-* @param $content are we retrieving the rights of a user, a group or a role (the database depends on it)
121
+* @param string $content are we retrieving the rights of a user, a group or a role (the database depends on it)
122 122
 * @param $id the id of the user, group or role
123 123
 * @author Patrick Cool <[email protected]>, Ghent University
124 124
 * @version 1.0
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 
527 527
 /**
528 528
 * This function gets all the roles that are defined
529
-* @param $content are we finding the roles for a user or a group (the database depends on it)
529
+* @param string $content are we finding the roles for a user or a group (the database depends on it)
530 530
 * @param $id the id of the user or group
531 531
 * @param string	Deprecated parameter allowing use of 'platform' scope - the corresponding tables don't exist anymore so the scope is always set to 'course'
532 532
 * @return array that contains the name of the roles the user has
Please login to merge, or discard this patch.
Braces   +10 added lines, -16 removed lines patch added patch discarded remove patch
@@ -132,24 +132,20 @@  discard block
 block discarded – undo
132 132
 	{
133 133
 		$table=Database::get_course_table(TABLE_PERMISSION_USER);
134 134
 		$id_field = 'user_id';
135
-	}
136
-	elseif ($content == 'group')
135
+	} elseif ($content == 'group')
137 136
 	{
138 137
 		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
139 138
 		$id_field = 'group_id';
140
-	}
141
-	elseif ($content == 'role')
139
+	} elseif ($content == 'role')
142 140
 	{
143 141
 		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
144 142
 		$id_field = 'role_id';
145
-	}
146
-	elseif ($content == 'platform_role')
143
+	} elseif ($content == 'platform_role')
147 144
 	{
148 145
 		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
149 146
 		$id_field = 'role_id';
150 147
         $course_id_condition = '';
151
-	}
152
-	elseif ($content == 'task')
148
+	} elseif ($content == 'task')
153 149
 	{
154 150
 		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
155 151
 		$id_field = 'task_id';
@@ -162,8 +158,9 @@  discard block
 block discarded – undo
162 158
 		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
163 159
 	$result = Database::query($sql);
164 160
 
165
-	while($row = Database::fetch_array($result))
166
-		$currentpermissions[$row['tool']][] = $row['action'];
161
+	while($row = Database::fetch_array($result)) {
162
+			$currentpermissions[$row['tool']][] = $row['action'];
163
+	}
167 164
 
168 165
 	return $currentpermissions;
169 166
 }
@@ -321,14 +318,12 @@  discard block
 block discarded – undo
321 318
 	if ($course_admin)
322 319
 	{
323 320
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
324
-	}
325
-	else
321
+	} else
326 322
 	{
327 323
 		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
328 324
 		{
329 325
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
330
-		}
331
-		else
326
+		} else
332 327
 		{
333 328
 			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
334 329
 			{
@@ -439,8 +434,7 @@  discard block
 block discarded – undo
439 434
 			$checked='checked';
440 435
 			$image='checkbox_on2.gif';
441 436
 			$action='revoke';
442
-		}
443
-		else
437
+		} else
444 438
 		{
445 439
 			$checked='';
446 440
 			$image='wrong.gif';
Please login to merge, or discard this patch.
Indentation   +401 added lines, -401 removed lines patch added patch discarded remove patch
@@ -25,38 +25,38 @@  discard block
 block discarded – undo
25 25
 function store_permissions($content, $id) {
26 26
     $course_id = api_get_course_int_id();
27 27
     
28
-	// Which database are we using (depending on the $content parameter)
29
-	if ($content=='user')
30
-	{
31
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
32
-		$id_field = user_id;
33
-	}
34
-	if ($content=='group')
35
-	{
36
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
37
-		$id_field = group_id;
38
-	}
39
-	if ($content=='role')
40
-	{
41
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
42
-		$id_field = role_id;
43
-	}
44
-
45
-	// We first delete all the existing permissions for that user/group/role
46
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
47
-	$result=Database::query($sql);
48
-
49
-	// looping through the post values to find the permission (containing the string permission* )
50
-	foreach ($_POST as $key => $value)
51
-	{
52
-		if (strstr($key,"permission*"))
53
-		{
54
-			list($brol,$tool,$action)=explode("*",$key);
55
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
56
-			$result=Database::query($sql);
57
-		}
58
-	}
59
-	return get_lang('PermissionsStored');
28
+    // Which database are we using (depending on the $content parameter)
29
+    if ($content=='user')
30
+    {
31
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
32
+        $id_field = user_id;
33
+    }
34
+    if ($content=='group')
35
+    {
36
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
37
+        $id_field = group_id;
38
+    }
39
+    if ($content=='role')
40
+    {
41
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
42
+        $id_field = role_id;
43
+    }
44
+
45
+    // We first delete all the existing permissions for that user/group/role
46
+    $sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
47
+    $result=Database::query($sql);
48
+
49
+    // looping through the post values to find the permission (containing the string permission* )
50
+    foreach ($_POST as $key => $value)
51
+    {
52
+        if (strstr($key,"permission*"))
53
+        {
54
+            list($brol,$tool,$action)=explode("*",$key);
55
+            $sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
56
+            $result=Database::query($sql);
57
+        }
58
+    }
59
+    return get_lang('PermissionsStored');
60 60
 }
61 61
 
62 62
 /**
@@ -70,50 +70,50 @@  discard block
 block discarded – undo
70 70
 * @version 1.0
71 71
 */
72 72
 function store_one_permission($content, $action, $id, $tool,$permission) {
73
-	global $rights_full;
73
+    global $rights_full;
74 74
     $course_id = api_get_course_int_id();
75
-	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
75
+    // for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
76 76
 
77
-	// check
78
-	//if(!in_array($permission, $rights_full))
79
-	//{
80
-	//	return get_lang('Error');
81
-	//}
77
+    // check
78
+    //if(!in_array($permission, $rights_full))
79
+    //{
80
+    //	return get_lang('Error');
81
+    //}
82 82
 
83
-	// Which database are we using (depending on the $content parameter)
83
+    // Which database are we using (depending on the $content parameter)
84 84
     
85
-	if ($content=='user') {
86
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
87
-		$id_field = user_id;
88
-	}
89
-	if ($content=='group')
90
-	{
91
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
92
-		$id_field = group_id;
93
-	}
94
-	if ($content=='role')
95
-	{
96
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
97
-		$id_field = role_id;
98
-	}
99
-
100
-	// grating a right
101
-	if ($action=='grant') {
102
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
103
-		$result=Database::query($sql);
104
-		if($result) {
105
-			$result_message=get_lang('PermissionGranted');
106
-		}
107
-	}
108
-	if ($action=='revoke')
109
-	{
110
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
111
-		$result=Database::query($sql);
112
-		if($result) {
113
-			$result_message=get_lang('PermissionRevoked');
114
-		}
115
-	}
116
-	return $result_message;
85
+    if ($content=='user') {
86
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
87
+        $id_field = user_id;
88
+    }
89
+    if ($content=='group')
90
+    {
91
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
92
+        $id_field = group_id;
93
+    }
94
+    if ($content=='role')
95
+    {
96
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
97
+        $id_field = role_id;
98
+    }
99
+
100
+    // grating a right
101
+    if ($action=='grant') {
102
+        $sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
103
+        $result=Database::query($sql);
104
+        if($result) {
105
+            $result_message=get_lang('PermissionGranted');
106
+        }
107
+    }
108
+    if ($action=='revoke')
109
+    {
110
+        $sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
111
+        $result=Database::query($sql);
112
+        if($result) {
113
+            $result_message=get_lang('PermissionRevoked');
114
+        }
115
+    }
116
+    return $result_message;
117 117
 }
118 118
 
119 119
 /**
@@ -125,47 +125,47 @@  discard block
 block discarded – undo
125 125
 */
126 126
 function get_permissions($content, $id) {
127 127
     $course_id = api_get_course_int_id();
128
-	$currentpermissions=array();
129
-	// Which database are we using (depending on the $content parameter)
128
+    $currentpermissions=array();
129
+    // Which database are we using (depending on the $content parameter)
130 130
     $course_id_condition = " c_id = $course_id AND ";
131
-	if ($content == 'user')
132
-	{
133
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
134
-		$id_field = 'user_id';
135
-	}
136
-	elseif ($content == 'group')
137
-	{
138
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
139
-		$id_field = 'group_id';
140
-	}
141
-	elseif ($content == 'role')
142
-	{
143
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
144
-		$id_field = 'role_id';
145
-	}
146
-	elseif ($content == 'platform_role')
147
-	{
148
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
149
-		$id_field = 'role_id';
131
+    if ($content == 'user')
132
+    {
133
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
134
+        $id_field = 'user_id';
135
+    }
136
+    elseif ($content == 'group')
137
+    {
138
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
139
+        $id_field = 'group_id';
140
+    }
141
+    elseif ($content == 'role')
142
+    {
143
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
144
+        $id_field = 'role_id';
145
+    }
146
+    elseif ($content == 'platform_role')
147
+    {
148
+        $table=Database::get_main_table(TABLE_ROLE_PERMISSION);
149
+        $id_field = 'role_id';
150 150
         $course_id_condition = '';
151
-	}
152
-	elseif ($content == 'task')
153
-	{
154
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
155
-		$id_field = 'task_id';
156
-	}
157
-
158
-	// finding all the permissions. We store this in a multidimensional array
159
-	// where the first dimension is the tool.
160
-	$sql="
151
+    }
152
+    elseif ($content == 'task')
153
+    {
154
+        $table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
155
+        $id_field = 'task_id';
156
+    }
157
+
158
+    // finding all the permissions. We store this in a multidimensional array
159
+    // where the first dimension is the tool.
160
+    $sql="
161 161
 		SELECT * FROM " . $table . "
162 162
 		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
163
-	$result = Database::query($sql);
163
+    $result = Database::query($sql);
164 164
 
165
-	while($row = Database::fetch_array($result))
166
-		$currentpermissions[$row['tool']][] = $row['action'];
165
+    while($row = Database::fetch_array($result))
166
+        $currentpermissions[$row['tool']][] = $row['action'];
167 167
 
168
-	return $currentpermissions;
168
+    return $currentpermissions;
169 169
 }
170 170
 
171 171
 /**
@@ -179,38 +179,38 @@  discard block
 block discarded – undo
179 179
 */
180 180
 function limited_or_full($current_permissions)
181 181
 {
182
-	if (api_get_setting('permissions')=='limited')
183
-	{
184
-		foreach ($current_permissions as $tool=>$tool_rights)
185
-		{
186
-			// we loop through the possible permissions of a tool and unset the entry if it is view
187
-			// if it is visibility or move we have to grant the edit right
188
-			foreach ($tool_rights as $key=>$value)
189
-			{
190
-				if ($value=='View')
191
-				{
192
-					unset($current_permissions[$tool][$key]);
193
-				}
194
-				if ($value=='Visibility' OR $value=='Move')
195
-				{
196
-					if (!in_array('Edit',$current_permissions[$tool]))
197
-					{
198
-						$current_permissions[$tool][]='Edit';
199
-					}
200
-					unset($current_permissions[$tool][$key]);
201
-				}
202
-				//else
203
-				//{
204
-				//	$current_permissions[$tool][]=$value;
205
-				//}
206
-			}
207
-		}
208
-		return $current_permissions;
209
-	}
210
-	if (api_get_setting('permissions')=='full')
211
-	{
212
-		return $current_permissions;
213
-	}
182
+    if (api_get_setting('permissions')=='limited')
183
+    {
184
+        foreach ($current_permissions as $tool=>$tool_rights)
185
+        {
186
+            // we loop through the possible permissions of a tool and unset the entry if it is view
187
+            // if it is visibility or move we have to grant the edit right
188
+            foreach ($tool_rights as $key=>$value)
189
+            {
190
+                if ($value=='View')
191
+                {
192
+                    unset($current_permissions[$tool][$key]);
193
+                }
194
+                if ($value=='Visibility' OR $value=='Move')
195
+                {
196
+                    if (!in_array('Edit',$current_permissions[$tool]))
197
+                    {
198
+                        $current_permissions[$tool][]='Edit';
199
+                    }
200
+                    unset($current_permissions[$tool][$key]);
201
+                }
202
+                //else
203
+                //{
204
+                //	$current_permissions[$tool][]=$value;
205
+                //}
206
+            }
207
+        }
208
+        return $current_permissions;
209
+    }
210
+    if (api_get_setting('permissions')=='full')
211
+    {
212
+        return $current_permissions;
213
+    }
214 214
 }
215 215
 /**
216 216
 * This function displays a checked or unchecked checkbox. The checkbox will be checked if the
@@ -224,12 +224,12 @@  discard block
 block discarded – undo
224 224
 */
225 225
 function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
226 226
 {
227
-	$checked="";
228
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
229
-	{
230
-		$checked="checked";
231
-	}
232
-	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
227
+    $checked="";
228
+    if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
229
+    {
230
+        $checked="checked";
231
+    }
232
+    echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
233 233
 
234 234
 }
235 235
 
@@ -245,62 +245,62 @@  discard block
 block discarded – undo
245 245
 */
246 246
 function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
247 247
 {
248
-	if ($course_admin) {
249
-		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
250
-	} else {
251
-		if (in_array($permission,$inherited_permissions[$tool])) {
252
-			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
253
-		} else {
254
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
255
-				if ($editable) {
256
-					$url=api_get_self();
257
-					$urlparameters = '';
258
-					foreach($_GET as $key=>$value) {
259
-						$parameter[$key]=$value;
260
-					}
261
-					$parameter['action']='revoke';
262
-					$parameter['permission']=$permission;
263
-					$parameter['tool']=$tool;
264
-					foreach ($parameter as $key=>$value) {
265
-						$urlparameters.=$key.'='.$value.'&amp;';
266
-					}
267
-					$url=$url.'?'.$urlparameters;
268
-
269
-					echo "\t\t\t <a href=\"".$url."\">";
270
-				}
271
-				echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/>";
272
-				if ($editable) {
273
-					echo "</a>";
274
-				}
275
-			} else {
276
-				if ($editable)
277
-				{
278
-					$url=api_get_self();
279
-					$urlparameters = '';
280
-					foreach ($_GET as $key=>$value)
281
-					{
282
-						$parameter[$key]=$value;
283
-					}
284
-					$parameter['action']='grant';
285
-					$parameter['permission']=$permission;
286
-					$parameter['tool']=$tool;
287
-					foreach ($parameter as $key=>$value)
288
-					{
289
-						$urlparameters.=$key.'='.$value.'&amp;';
290
-					}
291
-					$url=$url.'?'.$urlparameters;
292
-
293
-					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
294
-					echo "\t\t\t <a href=\"".$url."\">";
295
-				}
296
-				echo "<img src=\"../img/wrong.gif\" border=\"0\"/>";
297
-				if ($editable)
298
-				{
299
-					echo "</a>";
300
-				}
301
-			}
302
-		}
303
-	}
248
+    if ($course_admin) {
249
+        echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
250
+    } else {
251
+        if (in_array($permission,$inherited_permissions[$tool])) {
252
+            echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
253
+        } else {
254
+            if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
255
+                if ($editable) {
256
+                    $url=api_get_self();
257
+                    $urlparameters = '';
258
+                    foreach($_GET as $key=>$value) {
259
+                        $parameter[$key]=$value;
260
+                    }
261
+                    $parameter['action']='revoke';
262
+                    $parameter['permission']=$permission;
263
+                    $parameter['tool']=$tool;
264
+                    foreach ($parameter as $key=>$value) {
265
+                        $urlparameters.=$key.'='.$value.'&amp;';
266
+                    }
267
+                    $url=$url.'?'.$urlparameters;
268
+
269
+                    echo "\t\t\t <a href=\"".$url."\">";
270
+                }
271
+                echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/>";
272
+                if ($editable) {
273
+                    echo "</a>";
274
+                }
275
+            } else {
276
+                if ($editable)
277
+                {
278
+                    $url=api_get_self();
279
+                    $urlparameters = '';
280
+                    foreach ($_GET as $key=>$value)
281
+                    {
282
+                        $parameter[$key]=$value;
283
+                    }
284
+                    $parameter['action']='grant';
285
+                    $parameter['permission']=$permission;
286
+                    $parameter['tool']=$tool;
287
+                    foreach ($parameter as $key=>$value)
288
+                    {
289
+                        $urlparameters.=$key.'='.$value.'&amp;';
290
+                    }
291
+                    $url=$url.'?'.$urlparameters;
292
+
293
+                    //echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
294
+                    echo "\t\t\t <a href=\"".$url."\">";
295
+                }
296
+                echo "<img src=\"../img/wrong.gif\" border=\"0\"/>";
297
+                if ($editable)
298
+                {
299
+                    echo "</a>";
300
+                }
301
+            }
302
+        }
303
+    }
304 304
 }
305 305
 
306 306
 
@@ -318,72 +318,72 @@  discard block
 block discarded – undo
318 318
 function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
319 319
 {
320 320
 
321
-	if ($course_admin)
322
-	{
323
-		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
324
-	}
325
-	else
326
-	{
327
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
328
-		{
329
-			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
330
-		}
331
-		else
332
-		{
333
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
334
-			{
335
-				if ($editable)
336
-				{
337
-					$url = api_get_self();
338
-					$urlparameters = '';
339
-					foreach($_GET as $key => $value)
340
-					{
341
-						$parameter[$key] = $value;
342
-					}
343
-					$parameter['action']='manage_rights';
344
-					$parameter['do']='revoke';
345
-					$parameter['permission']=$permission;
346
-					$parameter['tool']=$tool;
347
-					$parameter['user_id']=$user_id;
348
-					foreach ($parameter as $key=>$value)
349
-					{
350
-						$urlparameters .= $key . '=' . $value . '&amp;';
351
-					}
352
-					$url = $url . '?' . $urlparameters;
353
-
354
-					echo "\t\t\t <a href=\"".$url."\">";
355
-				}
356
-				echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermission')."\">";
357
-				if ($editable) {
358
-					echo "</a>";
359
-				}
360
-			} else {
361
-				if ($editable) {
362
-					$url = api_get_self();
363
-					$urlparameters = '';
364
-					foreach ($_GET as $key=>$value) {
365
-						$parameter[$key]=$value;
366
-					}
367
-					$parameter['action']='manage_rights';
368
-					$parameter['do']='grant';
369
-					$parameter['permission']=$permission;
370
-					$parameter['tool']=$tool;
371
-					$parameter['user_id']=$user_id;
372
-					foreach ($parameter as $key=>$value) {
373
-						$urlparameters .= $key . '=' . $value . '&amp;';
374
-					}
375
-					$url=$url.'?'.$urlparameters;
376
-
377
-					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
378
-					echo "\t\t\t <a href=\"".$url."\">";
379
-				}
380
-				echo "<img src=\"../img/wrong.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermissionNot')."\">";
381
-				if ($editable) {
382
-					echo "</a>";
383
-				}
384
-			}
385
-		}
386
-	}
321
+    if ($course_admin)
322
+    {
323
+        echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
324
+    }
325
+    else
326
+    {
327
+        if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
328
+        {
329
+            echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
330
+        }
331
+        else
332
+        {
333
+            if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
334
+            {
335
+                if ($editable)
336
+                {
337
+                    $url = api_get_self();
338
+                    $urlparameters = '';
339
+                    foreach($_GET as $key => $value)
340
+                    {
341
+                        $parameter[$key] = $value;
342
+                    }
343
+                    $parameter['action']='manage_rights';
344
+                    $parameter['do']='revoke';
345
+                    $parameter['permission']=$permission;
346
+                    $parameter['tool']=$tool;
347
+                    $parameter['user_id']=$user_id;
348
+                    foreach ($parameter as $key=>$value)
349
+                    {
350
+                        $urlparameters .= $key . '=' . $value . '&amp;';
351
+                    }
352
+                    $url = $url . '?' . $urlparameters;
353
+
354
+                    echo "\t\t\t <a href=\"".$url."\">";
355
+                }
356
+                echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermission')."\">";
357
+                if ($editable) {
358
+                    echo "</a>";
359
+                }
360
+            } else {
361
+                if ($editable) {
362
+                    $url = api_get_self();
363
+                    $urlparameters = '';
364
+                    foreach ($_GET as $key=>$value) {
365
+                        $parameter[$key]=$value;
366
+                    }
367
+                    $parameter['action']='manage_rights';
368
+                    $parameter['do']='grant';
369
+                    $parameter['permission']=$permission;
370
+                    $parameter['tool']=$tool;
371
+                    $parameter['user_id']=$user_id;
372
+                    foreach ($parameter as $key=>$value) {
373
+                        $urlparameters .= $key . '=' . $value . '&amp;';
374
+                    }
375
+                    $url=$url.'?'.$urlparameters;
376
+
377
+                    //echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
378
+                    echo "\t\t\t <a href=\"".$url."\">";
379
+                }
380
+                echo "<img src=\"../img/wrong.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermissionNot')."\">";
381
+                if ($editable) {
382
+                    echo "</a>";
383
+                }
384
+            }
385
+        }
386
+    }
387 387
 }
388 388
 
389 389
 
@@ -394,41 +394,41 @@  discard block
 block discarded – undo
394 394
 */
395 395
 function display_role_list($current_course_roles, $current_platform_roles)
396 396
 {
397
-	global $setting_visualisation;
397
+    global $setting_visualisation;
398 398
     $course_id = api_get_course_int_id();
399 399
 
400
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
401
-
402
-	// course roles
403
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
404
-	$result=Database::query($sql);
405
-	while ($row=Database::fetch_array($result))
406
-	{
407
-		if (in_array($row['role_id'], $current_course_roles))
408
-		{
409
-			$checked='checked';
410
-			$image='checkbox_on2.gif';
411
-			$action='revoke';
412
-		}
413
-		else
414
-		{
415
-			$checked='';
416
-			$image='wrong.gif';
417
-			$action='grant';
418
-		}
419
-		if ($setting_visualisation=='checkbox')
420
-		{
421
-			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
422
-		}
423
-		if ($setting_visualisation=='image')
424
-		{
425
-			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
426
-		}
427
-
428
-
429
-		echo $row['role_name']." <a href=\"../permissions/roles.php?role_id=".$row['role_id']."&amp;scope=course\"><img src=\"../img/edit.gif\" /></a><br />\n";
430
-		echo $row['role_comment']."<br />\n";
431
-	}
400
+    $coures_roles_table=Database::get_course_table(TABLE_ROLE);
401
+
402
+    // course roles
403
+    $sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
404
+    $result=Database::query($sql);
405
+    while ($row=Database::fetch_array($result))
406
+    {
407
+        if (in_array($row['role_id'], $current_course_roles))
408
+        {
409
+            $checked='checked';
410
+            $image='checkbox_on2.gif';
411
+            $action='revoke';
412
+        }
413
+        else
414
+        {
415
+            $checked='';
416
+            $image='wrong.gif';
417
+            $action='grant';
418
+        }
419
+        if ($setting_visualisation=='checkbox')
420
+        {
421
+            echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
422
+        }
423
+        if ($setting_visualisation=='image')
424
+        {
425
+            echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
426
+        }
427
+
428
+
429
+        echo $row['role_name']." <a href=\"../permissions/roles.php?role_id=".$row['role_id']."&amp;scope=course\"><img src=\"../img/edit.gif\" /></a><br />\n";
430
+        echo $row['role_comment']."<br />\n";
431
+    }
432 432
 }
433 433
 
434 434
 /**
@@ -442,24 +442,24 @@  discard block
 block discarded – undo
442 442
 */
443 443
 function get_roles($content,$id, $scope='course') {
444 444
     $course_id  = api_get_course_int_id();    
445
-	if ($content=='user') {
446
-		$table=Database::get_course_table(TABLE_ROLE_USER);
447
-		$id_field = user_id;
448
-	}
449
-	if ($content=='group') {
450
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
451
-		$id_field = 'group_id';
452
-	}
453
-	$table_role=Database::get_course_table(TABLE_ROLE);
454
-
455
-	$current_roles=array();
456
-	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
457
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
458
-	$result=Database::query($sql);
459
-	while ($row=Database::fetch_array($result)) {
460
-		$current_roles[]=$row['role_id'];
461
-	}
462
-	return $current_roles;
445
+    if ($content=='user') {
446
+        $table=Database::get_course_table(TABLE_ROLE_USER);
447
+        $id_field = user_id;
448
+    }
449
+    if ($content=='group') {
450
+        $table=Database::get_course_table(TABLE_ROLE_GROUP);
451
+        $id_field = 'group_id';
452
+    }
453
+    $table_role=Database::get_course_table(TABLE_ROLE);
454
+
455
+    $current_roles=array();
456
+    //$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
457
+    $sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
458
+    $result=Database::query($sql);
459
+    while ($row=Database::fetch_array($result)) {
460
+        $current_roles[]=$row['role_id'];
461
+    }
462
+    return $current_roles;
463 463
 }
464 464
 
465 465
 /**
@@ -472,25 +472,25 @@  discard block
 block discarded – undo
472 472
     $course_id = api_get_course_int_id();
473 473
     $course_id_condition = " WHERE c_id = $course_id ";
474 474
     
475
-	if ($content=='course')
476
-	{
477
-		$table_role=Database::get_course_table(TABLE_ROLE);
478
-	}
479
-	if ($content=='platform')
480
-	{
481
-		$table_role=Database::get_main_table(TABLE_ROLE);
482
-		$course_id_condition = '';
483
-	}
484
-
485
-	$current_roles=array();
486
-	$sql="SELECT * FROM $table_role $course_id_condition ";
487
-	$result=Database::query($sql);
488
-	while ($row=Database::fetch_array($result))
489
-	{
490
-		$roles[]=$row;
491
-	}
492
-
493
-	return $roles;
475
+    if ($content=='course')
476
+    {
477
+        $table_role=Database::get_course_table(TABLE_ROLE);
478
+    }
479
+    if ($content=='platform')
480
+    {
481
+        $table_role=Database::get_main_table(TABLE_ROLE);
482
+        $course_id_condition = '';
483
+    }
484
+
485
+    $current_roles=array();
486
+    $sql="SELECT * FROM $table_role $course_id_condition ";
487
+    $result=Database::query($sql);
488
+    while ($row=Database::fetch_array($result))
489
+    {
490
+        $roles[]=$row;
491
+    }
492
+
493
+    return $roles;
494 494
 }
495 495
 
496 496
 
@@ -506,34 +506,34 @@  discard block
 block discarded – undo
506 506
 */
507 507
 function get_roles_permissions($content,$id, $scope='course') {
508 508
     $course_id = api_get_course_int_id();
509
-	if ($content == 'user') {
510
-		$table=Database::get_course_table(TABLE_ROLE_USER);
511
-		$id_field = 'user_id';
512
-	}
513
-
514
-	if ($content == 'group') {
515
-		$table = Database::get_course_table(TABLE_ROLE_GROUP);
516
-		$id_field = 'group_id';
517
-	}
518
-
519
-	// course roles or platform roles
520
-	$scope = 'course';
521
-	if ($scope == 'course') {
522
-		$table_role = Database::get_course_table(TABLE_ROLE);
523
-		$table_role_permissions = Database::get_course_table(TABLE_ROLE_PERMISSION);
509
+    if ($content == 'user') {
510
+        $table=Database::get_course_table(TABLE_ROLE_USER);
511
+        $id_field = 'user_id';
512
+    }
513
+
514
+    if ($content == 'group') {
515
+        $table = Database::get_course_table(TABLE_ROLE_GROUP);
516
+        $id_field = 'group_id';
517
+    }
518
+
519
+    // course roles or platform roles
520
+    $scope = 'course';
521
+    if ($scope == 'course') {
522
+        $table_role = Database::get_course_table(TABLE_ROLE);
523
+        $table_role_permissions = Database::get_course_table(TABLE_ROLE_PERMISSION);
524 524
         
525 525
         $role_condition = " role.c_id = $course_id AND role_permissions.c_id = $course_id AND ";
526
-	}
526
+    }
527 527
 
528
-	if ($scope == 'platform') {
529
-		$table_role = Database::get_main_table(TABLE_ROLE);
530
-		$table_role_permissions = Database::get_main_table(TABLE_ROLE_PERMISSION);
528
+    if ($scope == 'platform') {
529
+        $table_role = Database::get_main_table(TABLE_ROLE);
530
+        $table_role_permissions = Database::get_main_table(TABLE_ROLE_PERMISSION);
531 531
         $role_condition = '';
532
-	}
532
+    }
533 533
 
534
-	$current_roles = array();
534
+    $current_roles = array();
535 535
 
536
-	$sql = "
536
+    $sql = "
537 537
 		SELECT *
538 538
 		FROM
539 539
 			" . $table . " role_group_user,
@@ -547,12 +547,12 @@  discard block
 block discarded – undo
547 547
 			role_group_user.role_id = role.role_id AND
548 548
 			role.role_id = role_permissions.role_id";
549 549
 
550
-	$result = Database::query($sql);
550
+    $result = Database::query($sql);
551 551
     $current_role_permissions = array();
552
-	while ($row=Database::fetch_array($result)) {
553
-		$current_role_permissions[$row['tool']][]=$row['action'];
552
+    while ($row=Database::fetch_array($result)) {
553
+        $current_role_permissions[$row['tool']][]=$row['action'];
554 554
     }
555
-	return $current_role_permissions;
555
+    return $current_role_permissions;
556 556
 }
557 557
 
558 558
 /**
@@ -566,34 +566,34 @@  discard block
 block discarded – undo
566 566
 
567 567
 function assign_role($content, $action, $id, $role_id, $scope='course') {
568 568
     $course_id = api_get_course_int_id();
569
-	// Which database are we using (depending on the $content parameter)
570
-	if ($content=='user') {
571
-		$table=Database::get_course_table(TABLE_ROLE_USER);
572
-		$id_field = 'user_id';
573
-	} elseif($content=='group') {
574
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
575
-		$id_field = 'group_id';
576
-	} else {
577
-		return  get_lang('Error');
578
-	}
579
-
580
-	// grating a right
581
-	if ($action=='grant') {
582
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
583
-		$result=Database::query($sql);
584
-		if ($result) {
585
-			$result_message=get_lang('RoleGranted');
586
-		}
587
-	}
569
+    // Which database are we using (depending on the $content parameter)
570
+    if ($content=='user') {
571
+        $table=Database::get_course_table(TABLE_ROLE_USER);
572
+        $id_field = 'user_id';
573
+    } elseif($content=='group') {
574
+        $table=Database::get_course_table(TABLE_ROLE_GROUP);
575
+        $id_field = 'group_id';
576
+    } else {
577
+        return  get_lang('Error');
578
+    }
579
+
580
+    // grating a right
581
+    if ($action=='grant') {
582
+        $sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
583
+        $result=Database::query($sql);
584
+        if ($result) {
585
+            $result_message=get_lang('RoleGranted');
586
+        }
587
+    }
588 588
     
589
-	if ($action=='revoke') {
590
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
591
-		$result=Database::query($sql);
592
-		if ($result) {
593
-			$result_message=get_lang('RoleRevoked');
594
-		}
595
-	}
596
-	return $result_message;
589
+    if ($action=='revoke') {
590
+        $sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
591
+        $result=Database::query($sql);
592
+        if ($result) {
593
+            $result_message=get_lang('RoleRevoked');
594
+        }
595
+    }
596
+    return $result_message;
597 597
 }
598 598
 
599 599
 
@@ -603,21 +603,21 @@  discard block
 block discarded – undo
603 603
 */
604 604
 function permission_array_merge($array1, $array2)
605 605
 {
606
-	foreach ($array2 as $tool=>$permissions)
607
-	{
608
-		foreach ($permissions as $permissionkey=>$permissionvalue)
609
-		{
610
-			$array1[$tool][]=$permissionvalue;
611
-		}
612
-	}
613
-	return $array1;
606
+    foreach ($array2 as $tool=>$permissions)
607
+    {
608
+        foreach ($permissions as $permissionkey=>$permissionvalue)
609
+        {
610
+            $array1[$tool][]=$permissionvalue;
611
+        }
612
+    }
613
+    return $array1;
614 614
 }
615 615
 
616 616
 
617 617
 function my_print_r($array)
618 618
 {
619
-	echo '<pre>';
620
-	print_r($array);
621
-	echo '</pre>';
619
+    echo '<pre>';
620
+    print_r($array);
621
+    echo '</pre>';
622 622
 }
623 623
 ?>
Please login to merge, or discard this patch.
Spacing   +143 added lines, -143 removed lines patch added patch discarded remove patch
@@ -26,34 +26,34 @@  discard block
 block discarded – undo
26 26
     $course_id = api_get_course_int_id();
27 27
     
28 28
 	// Which database are we using (depending on the $content parameter)
29
-	if ($content=='user')
29
+	if ($content == 'user')
30 30
 	{
31
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
31
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
32 32
 		$id_field = user_id;
33 33
 	}
34
-	if ($content=='group')
34
+	if ($content == 'group')
35 35
 	{
36
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
36
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
37 37
 		$id_field = group_id;
38 38
 	}
39
-	if ($content=='role')
39
+	if ($content == 'role')
40 40
 	{
41
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
41
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
42 42
 		$id_field = role_id;
43 43
 	}
44 44
 
45 45
 	// We first delete all the existing permissions for that user/group/role
46
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
47
-	$result=Database::query($sql);
46
+	$sql = "DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
47
+	$result = Database::query($sql);
48 48
 
49 49
 	// looping through the post values to find the permission (containing the string permission* )
50 50
 	foreach ($_POST as $key => $value)
51 51
 	{
52
-		if (strstr($key,"permission*"))
52
+		if (strstr($key, "permission*"))
53 53
 		{
54
-			list($brol,$tool,$action)=explode("*",$key);
55
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
56
-			$result=Database::query($sql);
54
+			list($brol, $tool, $action) = explode("*", $key);
55
+			$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
56
+			$result = Database::query($sql);
57 57
 		}
58 58
 	}
59 59
 	return get_lang('PermissionsStored');
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 * @author Patrick Cool <[email protected]>, Ghent University
70 70
 * @version 1.0
71 71
 */
72
-function store_one_permission($content, $action, $id, $tool,$permission) {
72
+function store_one_permission($content, $action, $id, $tool, $permission) {
73 73
 	global $rights_full;
74 74
     $course_id = api_get_course_int_id();
75 75
 	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
@@ -82,35 +82,35 @@  discard block
 block discarded – undo
82 82
 
83 83
 	// Which database are we using (depending on the $content parameter)
84 84
     
85
-	if ($content=='user') {
86
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
85
+	if ($content == 'user') {
86
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
87 87
 		$id_field = user_id;
88 88
 	}
89
-	if ($content=='group')
89
+	if ($content == 'group')
90 90
 	{
91
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
91
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
92 92
 		$id_field = group_id;
93 93
 	}
94
-	if ($content=='role')
94
+	if ($content == 'role')
95 95
 	{
96
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
96
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
97 97
 		$id_field = role_id;
98 98
 	}
99 99
 
100 100
 	// grating a right
101
-	if ($action=='grant') {
102
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
103
-		$result=Database::query($sql);
104
-		if($result) {
105
-			$result_message=get_lang('PermissionGranted');
101
+	if ($action == 'grant') {
102
+		$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
103
+		$result = Database::query($sql);
104
+		if ($result) {
105
+			$result_message = get_lang('PermissionGranted');
106 106
 		}
107 107
 	}
108
-	if ($action=='revoke')
108
+	if ($action == 'revoke')
109 109
 	{
110
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
111
-		$result=Database::query($sql);
112
-		if($result) {
113
-			$result_message=get_lang('PermissionRevoked');
110
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
111
+		$result = Database::query($sql);
112
+		if ($result) {
113
+			$result_message = get_lang('PermissionRevoked');
114 114
 		}
115 115
 	}
116 116
 	return $result_message;
@@ -125,44 +125,44 @@  discard block
 block discarded – undo
125 125
 */
126 126
 function get_permissions($content, $id) {
127 127
     $course_id = api_get_course_int_id();
128
-	$currentpermissions=array();
128
+	$currentpermissions = array();
129 129
 	// Which database are we using (depending on the $content parameter)
130 130
     $course_id_condition = " c_id = $course_id AND ";
131 131
 	if ($content == 'user')
132 132
 	{
133
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
133
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
134 134
 		$id_field = 'user_id';
135 135
 	}
136 136
 	elseif ($content == 'group')
137 137
 	{
138
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
138
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
139 139
 		$id_field = 'group_id';
140 140
 	}
141 141
 	elseif ($content == 'role')
142 142
 	{
143
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
143
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
144 144
 		$id_field = 'role_id';
145 145
 	}
146 146
 	elseif ($content == 'platform_role')
147 147
 	{
148
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
148
+		$table = Database::get_main_table(TABLE_ROLE_PERMISSION);
149 149
 		$id_field = 'role_id';
150 150
         $course_id_condition = '';
151 151
 	}
152 152
 	elseif ($content == 'task')
153 153
 	{
154
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
154
+		$table = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
155 155
 		$id_field = 'task_id';
156 156
 	}
157 157
 
158 158
 	// finding all the permissions. We store this in a multidimensional array
159 159
 	// where the first dimension is the tool.
160
-	$sql="
161
-		SELECT * FROM " . $table . "
162
-		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
160
+	$sql = "
161
+		SELECT * FROM " . $table."
162
+		WHERE $course_id_condition ".$id_field."='".Database::escape_string($id)."'";
163 163
 	$result = Database::query($sql);
164 164
 
165
-	while($row = Database::fetch_array($result))
165
+	while ($row = Database::fetch_array($result))
166 166
 		$currentpermissions[$row['tool']][] = $row['action'];
167 167
 
168 168
 	return $currentpermissions;
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 */
180 180
 function limited_or_full($current_permissions)
181 181
 {
182
-	if (api_get_setting('permissions')=='limited')
182
+	if (api_get_setting('permissions') == 'limited')
183 183
 	{
184 184
 		foreach ($current_permissions as $tool=>$tool_rights)
185 185
 		{
@@ -187,15 +187,15 @@  discard block
 block discarded – undo
187 187
 			// if it is visibility or move we have to grant the edit right
188 188
 			foreach ($tool_rights as $key=>$value)
189 189
 			{
190
-				if ($value=='View')
190
+				if ($value == 'View')
191 191
 				{
192 192
 					unset($current_permissions[$tool][$key]);
193 193
 				}
194
-				if ($value=='Visibility' OR $value=='Move')
194
+				if ($value == 'Visibility' OR $value == 'Move')
195 195
 				{
196
-					if (!in_array('Edit',$current_permissions[$tool]))
196
+					if (!in_array('Edit', $current_permissions[$tool]))
197 197
 					{
198
-						$current_permissions[$tool][]='Edit';
198
+						$current_permissions[$tool][] = 'Edit';
199 199
 					}
200 200
 					unset($current_permissions[$tool][$key]);
201 201
 				}
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 		}
208 208
 		return $current_permissions;
209 209
 	}
210
-	if (api_get_setting('permissions')=='full')
210
+	if (api_get_setting('permissions') == 'full')
211 211
 	{
212 212
 		return $current_permissions;
213 213
 	}
@@ -222,12 +222,12 @@  discard block
 block discarded – undo
222 222
 * @author Patrick Cool <[email protected]>, Ghent University
223 223
 * @version 1.0
224 224
 */
225
-function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
225
+function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions = array())
226 226
 {
227
-	$checked="";
228
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
227
+	$checked = "";
228
+	if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
229 229
 	{
230
-		$checked="checked";
230
+		$checked = "checked";
231 231
 	}
232 232
 	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
233 233
 
@@ -243,28 +243,28 @@  discard block
 block discarded – undo
243 243
 * @author Patrick Cool <[email protected]>, Ghent University
244 244
 * @version 1.0
245 245
 */
246
-function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
246
+function display_image_matrix($permission_array, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
247 247
 {
248 248
 	if ($course_admin) {
249 249
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
250 250
 	} else {
251
-		if (in_array($permission,$inherited_permissions[$tool])) {
251
+		if (in_array($permission, $inherited_permissions[$tool])) {
252 252
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
253 253
 		} else {
254
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
254
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool])) {
255 255
 				if ($editable) {
256
-					$url=api_get_self();
256
+					$url = api_get_self();
257 257
 					$urlparameters = '';
258
-					foreach($_GET as $key=>$value) {
259
-						$parameter[$key]=$value;
258
+					foreach ($_GET as $key=>$value) {
259
+						$parameter[$key] = $value;
260 260
 					}
261
-					$parameter['action']='revoke';
262
-					$parameter['permission']=$permission;
263
-					$parameter['tool']=$tool;
261
+					$parameter['action'] = 'revoke';
262
+					$parameter['permission'] = $permission;
263
+					$parameter['tool'] = $tool;
264 264
 					foreach ($parameter as $key=>$value) {
265
-						$urlparameters.=$key.'='.$value.'&amp;';
265
+						$urlparameters .= $key.'='.$value.'&amp;';
266 266
 					}
267
-					$url=$url.'?'.$urlparameters;
267
+					$url = $url.'?'.$urlparameters;
268 268
 
269 269
 					echo "\t\t\t <a href=\"".$url."\">";
270 270
 				}
@@ -275,20 +275,20 @@  discard block
 block discarded – undo
275 275
 			} else {
276 276
 				if ($editable)
277 277
 				{
278
-					$url=api_get_self();
278
+					$url = api_get_self();
279 279
 					$urlparameters = '';
280 280
 					foreach ($_GET as $key=>$value)
281 281
 					{
282
-						$parameter[$key]=$value;
282
+						$parameter[$key] = $value;
283 283
 					}
284
-					$parameter['action']='grant';
285
-					$parameter['permission']=$permission;
286
-					$parameter['tool']=$tool;
284
+					$parameter['action'] = 'grant';
285
+					$parameter['permission'] = $permission;
286
+					$parameter['tool'] = $tool;
287 287
 					foreach ($parameter as $key=>$value)
288 288
 					{
289
-						$urlparameters.=$key.'='.$value.'&amp;';
289
+						$urlparameters .= $key.'='.$value.'&amp;';
290 290
 					}
291
-					$url=$url.'?'.$urlparameters;
291
+					$url = $url.'?'.$urlparameters;
292 292
 
293 293
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
294 294
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 * @author Patrick Cool <[email protected]>, Ghent University
316 316
 * @version 1.0
317 317
 */
318
-function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
318
+function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
319 319
 {
320 320
 
321 321
 	if ($course_admin)
@@ -324,32 +324,32 @@  discard block
 block discarded – undo
324 324
 	}
325 325
 	else
326 326
 	{
327
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
327
+		if (!empty($inherited_permissions) and in_array($permission, $inherited_permissions[$tool]))
328 328
 		{
329 329
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
330 330
 		}
331 331
 		else
332 332
 		{
333
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
333
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
334 334
 			{
335 335
 				if ($editable)
336 336
 				{
337 337
 					$url = api_get_self();
338 338
 					$urlparameters = '';
339
-					foreach($_GET as $key => $value)
339
+					foreach ($_GET as $key => $value)
340 340
 					{
341 341
 						$parameter[$key] = $value;
342 342
 					}
343
-					$parameter['action']='manage_rights';
344
-					$parameter['do']='revoke';
345
-					$parameter['permission']=$permission;
346
-					$parameter['tool']=$tool;
347
-					$parameter['user_id']=$user_id;
343
+					$parameter['action'] = 'manage_rights';
344
+					$parameter['do'] = 'revoke';
345
+					$parameter['permission'] = $permission;
346
+					$parameter['tool'] = $tool;
347
+					$parameter['user_id'] = $user_id;
348 348
 					foreach ($parameter as $key=>$value)
349 349
 					{
350
-						$urlparameters .= $key . '=' . $value . '&amp;';
350
+						$urlparameters .= $key.'='.$value.'&amp;';
351 351
 					}
352
-					$url = $url . '?' . $urlparameters;
352
+					$url = $url.'?'.$urlparameters;
353 353
 
354 354
 					echo "\t\t\t <a href=\"".$url."\">";
355 355
 				}
@@ -362,17 +362,17 @@  discard block
 block discarded – undo
362 362
 					$url = api_get_self();
363 363
 					$urlparameters = '';
364 364
 					foreach ($_GET as $key=>$value) {
365
-						$parameter[$key]=$value;
365
+						$parameter[$key] = $value;
366 366
 					}
367
-					$parameter['action']='manage_rights';
368
-					$parameter['do']='grant';
369
-					$parameter['permission']=$permission;
370
-					$parameter['tool']=$tool;
371
-					$parameter['user_id']=$user_id;
367
+					$parameter['action'] = 'manage_rights';
368
+					$parameter['do'] = 'grant';
369
+					$parameter['permission'] = $permission;
370
+					$parameter['tool'] = $tool;
371
+					$parameter['user_id'] = $user_id;
372 372
 					foreach ($parameter as $key=>$value) {
373
-						$urlparameters .= $key . '=' . $value . '&amp;';
373
+						$urlparameters .= $key.'='.$value.'&amp;';
374 374
 					}
375
-					$url=$url.'?'.$urlparameters;
375
+					$url = $url.'?'.$urlparameters;
376 376
 
377 377
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
378 378
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -397,30 +397,30 @@  discard block
 block discarded – undo
397 397
 	global $setting_visualisation;
398 398
     $course_id = api_get_course_int_id();
399 399
 
400
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
400
+	$coures_roles_table = Database::get_course_table(TABLE_ROLE);
401 401
 
402 402
 	// course roles
403
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
404
-	$result=Database::query($sql);
405
-	while ($row=Database::fetch_array($result))
403
+	$sql = "SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
404
+	$result = Database::query($sql);
405
+	while ($row = Database::fetch_array($result))
406 406
 	{
407 407
 		if (in_array($row['role_id'], $current_course_roles))
408 408
 		{
409
-			$checked='checked';
410
-			$image='checkbox_on2.gif';
411
-			$action='revoke';
409
+			$checked = 'checked';
410
+			$image = 'checkbox_on2.gif';
411
+			$action = 'revoke';
412 412
 		}
413 413
 		else
414 414
 		{
415
-			$checked='';
416
-			$image='wrong.gif';
417
-			$action='grant';
415
+			$checked = '';
416
+			$image = 'wrong.gif';
417
+			$action = 'grant';
418 418
 		}
419
-		if ($setting_visualisation=='checkbox')
419
+		if ($setting_visualisation == 'checkbox')
420 420
 		{
421 421
 			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
422 422
 		}
423
-		if ($setting_visualisation=='image')
423
+		if ($setting_visualisation == 'image')
424 424
 		{
425 425
 			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
426 426
 		}
@@ -440,24 +440,24 @@  discard block
 block discarded – undo
440 440
 * @author Patrick Cool <[email protected]>, Ghent University
441 441
 * @version 1.0
442 442
 */
443
-function get_roles($content,$id, $scope='course') {
444
-    $course_id  = api_get_course_int_id();    
445
-	if ($content=='user') {
446
-		$table=Database::get_course_table(TABLE_ROLE_USER);
443
+function get_roles($content, $id, $scope = 'course') {
444
+    $course_id = api_get_course_int_id();    
445
+	if ($content == 'user') {
446
+		$table = Database::get_course_table(TABLE_ROLE_USER);
447 447
 		$id_field = user_id;
448 448
 	}
449
-	if ($content=='group') {
450
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
449
+	if ($content == 'group') {
450
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
451 451
 		$id_field = 'group_id';
452 452
 	}
453
-	$table_role=Database::get_course_table(TABLE_ROLE);
453
+	$table_role = Database::get_course_table(TABLE_ROLE);
454 454
 
455
-	$current_roles=array();
455
+	$current_roles = array();
456 456
 	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
457
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
458
-	$result=Database::query($sql);
459
-	while ($row=Database::fetch_array($result)) {
460
-		$current_roles[]=$row['role_id'];
457
+	$sql = "SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
458
+	$result = Database::query($sql);
459
+	while ($row = Database::fetch_array($result)) {
460
+		$current_roles[] = $row['role_id'];
461 461
 	}
462 462
 	return $current_roles;
463 463
 }
@@ -468,26 +468,26 @@  discard block
 block discarded – undo
468 468
 * @author Patrick Cool <[email protected]>, Ghent University
469 469
 * @version 1.0
470 470
 */
471
-function get_all_roles($content='course') {
471
+function get_all_roles($content = 'course') {
472 472
     $course_id = api_get_course_int_id();
473 473
     $course_id_condition = " WHERE c_id = $course_id ";
474 474
     
475
-	if ($content=='course')
475
+	if ($content == 'course')
476 476
 	{
477
-		$table_role=Database::get_course_table(TABLE_ROLE);
477
+		$table_role = Database::get_course_table(TABLE_ROLE);
478 478
 	}
479
-	if ($content=='platform')
479
+	if ($content == 'platform')
480 480
 	{
481
-		$table_role=Database::get_main_table(TABLE_ROLE);
481
+		$table_role = Database::get_main_table(TABLE_ROLE);
482 482
 		$course_id_condition = '';
483 483
 	}
484 484
 
485
-	$current_roles=array();
486
-	$sql="SELECT * FROM $table_role $course_id_condition ";
487
-	$result=Database::query($sql);
488
-	while ($row=Database::fetch_array($result))
485
+	$current_roles = array();
486
+	$sql = "SELECT * FROM $table_role $course_id_condition ";
487
+	$result = Database::query($sql);
488
+	while ($row = Database::fetch_array($result))
489 489
 	{
490
-		$roles[]=$row;
490
+		$roles[] = $row;
491 491
 	}
492 492
 
493 493
 	return $roles;
@@ -504,10 +504,10 @@  discard block
 block discarded – undo
504 504
 * @author Patrick Cool <[email protected]>, Ghent University
505 505
 * @version 1.0
506 506
 */
507
-function get_roles_permissions($content,$id, $scope='course') {
507
+function get_roles_permissions($content, $id, $scope = 'course') {
508 508
     $course_id = api_get_course_int_id();
509 509
 	if ($content == 'user') {
510
-		$table=Database::get_course_table(TABLE_ROLE_USER);
510
+		$table = Database::get_course_table(TABLE_ROLE_USER);
511 511
 		$id_field = 'user_id';
512 512
 	}
513 513
 
@@ -536,21 +536,21 @@  discard block
 block discarded – undo
536 536
 	$sql = "
537 537
 		SELECT *
538 538
 		FROM
539
-			" . $table . " role_group_user,
540
-			" . $table_role . " role,
541
-			" . $table_role_permissions . " role_permissions
539
+			" . $table." role_group_user,
540
+			" . $table_role." role,
541
+			" . $table_role_permissions." role_permissions
542 542
 		WHERE
543 543
 		    role_group_user.c_id = $course_id AND
544 544
 		    $role_condition
545
-			role_group_user.scope = '" . $scope . "' AND
546
-			role_group_user." . $id_field . " = '" . $id . "' AND
545
+			role_group_user.scope = '".$scope."' AND
546
+			role_group_user." . $id_field." = '".$id."' AND
547 547
 			role_group_user.role_id = role.role_id AND
548 548
 			role.role_id = role_permissions.role_id";
549 549
 
550 550
 	$result = Database::query($sql);
551 551
     $current_role_permissions = array();
552
-	while ($row=Database::fetch_array($result)) {
553
-		$current_role_permissions[$row['tool']][]=$row['action'];
552
+	while ($row = Database::fetch_array($result)) {
553
+		$current_role_permissions[$row['tool']][] = $row['action'];
554 554
     }
555 555
 	return $current_role_permissions;
556 556
 }
@@ -564,33 +564,33 @@  discard block
 block discarded – undo
564 564
 * @author Patrick Cool <[email protected]>, Ghent University
565 565
 */
566 566
 
567
-function assign_role($content, $action, $id, $role_id, $scope='course') {
567
+function assign_role($content, $action, $id, $role_id, $scope = 'course') {
568 568
     $course_id = api_get_course_int_id();
569 569
 	// Which database are we using (depending on the $content parameter)
570
-	if ($content=='user') {
571
-		$table=Database::get_course_table(TABLE_ROLE_USER);
570
+	if ($content == 'user') {
571
+		$table = Database::get_course_table(TABLE_ROLE_USER);
572 572
 		$id_field = 'user_id';
573
-	} elseif($content=='group') {
574
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
573
+	} elseif ($content == 'group') {
574
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
575 575
 		$id_field = 'group_id';
576 576
 	} else {
577 577
 		return  get_lang('Error');
578 578
 	}
579 579
 
580 580
 	// grating a right
581
-	if ($action=='grant') {
582
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
583
-		$result=Database::query($sql);
581
+	if ($action == 'grant') {
582
+		$sql = "INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
583
+		$result = Database::query($sql);
584 584
 		if ($result) {
585
-			$result_message=get_lang('RoleGranted');
585
+			$result_message = get_lang('RoleGranted');
586 586
 		}
587 587
 	}
588 588
     
589
-	if ($action=='revoke') {
590
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
591
-		$result=Database::query($sql);
589
+	if ($action == 'revoke') {
590
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
591
+		$result = Database::query($sql);
592 592
 		if ($result) {
593
-			$result_message=get_lang('RoleRevoked');
593
+			$result_message = get_lang('RoleRevoked');
594 594
 		}
595 595
 	}
596 596
 	return $result_message;
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 	{
608 608
 		foreach ($permissions as $permissionkey=>$permissionvalue)
609 609
 		{
610
-			$array1[$tool][]=$permissionvalue;
610
+			$array1[$tool][] = $permissionvalue;
611 611
 		}
612 612
 	}
613 613
 	return $array1;
Please login to merge, or discard this patch.
main/resourcelinker/resourcelinker.inc.php 4 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -338,6 +338,10 @@
 block discarded – undo
338 338
 * @param icon        - if ="icon" then the small icon will appear
339 339
 *                      if ="wrap" then wrapped settings are used (and no icon is displayed)
340 340
 *                      if ="nolink" then only the name is returned with no href and no icon (note:only in this case, the result is not displayed, but returned)
341
+* @param string $completed
342
+* @param string $id_in_path
343
+* @param string $builder
344
+* @param string $icon
341 345
 * @todo this function is too long, rewrite
342 346
 */
343 347
 function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0)
Please login to merge, or discard this patch.
Braces   +75 added lines, -116 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@  discard block
 block discarded – undo
69 69
 	if (api_is_allowed_to_edit())
70 70
 	{
71 71
 		$visibility="ip.visibility<>'2'";
72
-	}
73
-	else
72
+	} else
74 73
 	{
75 74
 		$visibility="ip.visibility='1'";
76 75
 	}
@@ -96,8 +95,7 @@  discard block
 block discarded – undo
96 95
 				if (file_or_folder($row['path']))
97 96
 				{
98 97
 						echo '<img src="../img/file.gif" align="middle" />';
99
-				}
100
-				else
98
+				} else
101 99
 				{
102 100
 					$image = choose_image($row['path']);
103 101
 					echo "<img src=\"../img/$image\" align=\"middle\" />";
@@ -108,16 +106,14 @@  discard block
 block discarded – undo
108 106
 				{
109 107
 					echo "<a href='".api_get_self()."?content=Document";
110 108
 					echo "&amp;folder=".substr($row['path'],1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'],1).'</a><br />';
111
-				}
112
-				else
109
+				} else
113 110
 				{
114 111
 					echo substr($row['path'],1).' ';
115 112
 					echo showorhide_addresourcelink('Document',$row['id']);
116 113
 					echo '<br />';
117 114
 				}
118 115
 			}
119
-		}
120
-		else
116
+		} else
121 117
 		{
122 118
 			// we calculate the level we are in by using the $folder in the url
123 119
 			// we put +1 because it does not start with an / and in the database it does
@@ -156,8 +152,7 @@  discard block
 block discarded – undo
156 152
 				if (file_or_folder($path))
157 153
 				{
158 154
 					echo '<img src="../img/file.gif" align="middle" />';
159
-				}
160
-				else
155
+				} else
161 156
 				{
162 157
 					$image = choose_image($path);
163 158
 					echo "<img src=\"../img/$image\" align=\"middle\" />";
@@ -172,8 +167,7 @@  discard block
 block discarded – undo
172 167
 					//using the correct name of the folder
173 168
 					$folder_name=str_replace($folder.'/','',$path);
174 169
 					echo "<a href='$newuri'>".$folder_name.'</a><br />';
175
-				}
176
-				else
170
+				} else
177 171
 				{
178 172
 					echo str_replace("/$folder/", '',$path).' ';
179 173
 					echo showorhide_addresourcelink('Document',$good_ids[$good_key]);
@@ -349,9 +343,14 @@  discard block
 block discarded – undo
349 343
 
350 344
 	$length = ((($builder == 'builder') and ($icon == 'nolink')) ? 65 : 32);
351 345
 
352
-	if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
346
+	if ($builder != 'builder') {
347
+	    $origin = 'learnpath';
348
+	}
349
+	//origin = learnpath in student view
353 350
 	$linktype = $type;
354
-	if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
351
+	if (($type == 'Link _self') or ($type == 'Link _blank')) {
352
+	    $type = 'Link';
353
+	}
355 354
 
356 355
 	switch ($type)
357 356
 	{
@@ -371,7 +370,7 @@  discard block
 block discarded – undo
371 370
 			{
372 371
 				if ($completed=='completed') {
373 372
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
374
-				}	else {
373
+				} else {
375 374
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
376 375
 					//echo "&nbsp;";
377 376
 				}
@@ -391,14 +390,12 @@  discard block
 block discarded – undo
391 390
 					if ($icon != 'wrap')
392 391
 					{
393 392
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
394
-					}
395
-					else
393
+					} else
396 394
 					{
397 395
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
398 396
 					}
399 397
 				}
400
-			}
401
-			else
398
+			} else
402 399
 			{
403 400
 				echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
404 401
 			}
@@ -426,7 +423,7 @@  discard block
 block discarded – undo
426 423
 			{
427 424
 				if ($completed=='completed') {
428 425
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
429
-				}	else {
426
+				} else {
430 427
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
431 428
 					//echo "&nbsp;";
432 429
 				}
@@ -450,14 +447,12 @@  discard block
 block discarded – undo
450 447
 					if ($icon != 'wrap')
451 448
 					{
452 449
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
453
-					}
454
-					else
450
+					} else
455 451
 					{
456 452
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
457 453
 					}
458 454
 				}
459
-			}
460
-			else
455
+			} else
461 456
 			{
462 457
 				echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title,($length-3*$level))."</a>";
463 458
 			}
@@ -479,7 +474,7 @@  discard block
 block discarded – undo
479 474
 			{
480 475
 				if ($completed=='completed') {
481 476
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
482
-				}	else {
477
+				} else {
483 478
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
484 479
 					//echo "&nbsp;";
485 480
 				}
@@ -495,8 +490,7 @@  discard block
 block discarded – undo
495 490
 			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
496 491
 			if ($icon == 'icon')
497 492
 			{
498
-				if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
499
-				   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
493
+				if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; } else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
500 494
 			}
501 495
 			$thelink=$myrow["url"];
502 496
 			if ($builder != 'builder')
@@ -508,14 +502,12 @@  discard block
 block discarded – undo
508 502
 					if ($icon != 'wrap')
509 503
 					{
510 504
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
511
-					}
512
-					else
505
+					} else
513 506
 					{
514 507
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
515 508
 					}
516 509
 				}
517
-			}
518
-			else
510
+			} else
519 511
 			{
520 512
 				echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
521 513
 			}
@@ -540,7 +532,7 @@  discard block
 block discarded – undo
540 532
 			{
541 533
 				if ($completed=='completed') {
542 534
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
543
-				}	else {
535
+				} else {
544 536
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
545 537
 					//echo "&nbsp;";
546 538
 				}
@@ -563,14 +555,12 @@  discard block
 block discarded – undo
563 555
 					if ($icon != 'wrap')
564 556
 					{
565 557
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
566
-					}
567
-					else
558
+					} else
568 559
 					{
569 560
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
570 561
 					}
571 562
 				}
572
-			}
573
-			else
563
+			} else
574 564
 			{
575 565
 				echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
576 566
 			}
@@ -598,7 +588,7 @@  discard block
 block discarded – undo
598 588
 			{
599 589
 				if ($completed=='completed') {
600 590
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
601
-				}	else {
591
+				} else {
602 592
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
603 593
 					//echo "&nbsp;";
604 594
 				}
@@ -621,14 +611,12 @@  discard block
 block discarded – undo
621 611
 					if ($icon != 'wrap')
622 612
 					{
623 613
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
624
-					}
625
-					else
614
+					} else
626 615
 					{
627 616
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
628 617
 					}
629 618
 				}
630
-			}
631
-			else
619
+			} else
632 620
 			{
633 621
 				echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
634 622
 			}
@@ -650,7 +638,7 @@  discard block
 block discarded – undo
650 638
 			{
651 639
 				if ($completed=='completed') {
652 640
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
653
-				}	else {
641
+				} else {
654 642
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
655 643
 					//echo "&nbsp;";
656 644
 				}
@@ -671,14 +659,12 @@  discard block
 block discarded – undo
671 659
 					if ($icon != 'wrap')
672 660
 					{
673 661
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
674
-					}
675
-					else
662
+					} else
676 663
 					{
677 664
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
678 665
 					}
679 666
 				}
680
-			}
681
-			else
667
+			} else
682 668
 			{
683 669
 				echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
684 670
 			}
@@ -704,7 +690,7 @@  discard block
 block discarded – undo
704 690
 			{
705 691
 				if ($completed=='completed') {
706 692
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
707
-				}	else {
693
+				} else {
708 694
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
709 695
 					//echo "&nbsp;";
710 696
 				}
@@ -724,14 +710,12 @@  discard block
 block discarded – undo
724 710
 					if ($icon != 'wrap')
725 711
 					{
726 712
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
727
-					}
728
-					else
713
+					} else
729 714
 					{
730 715
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
731 716
 					}
732 717
 				}
733
-			}
734
-			else
718
+			} else
735 719
 			{
736 720
 				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
737 721
 			}
@@ -765,7 +749,7 @@  discard block
 block discarded – undo
765 749
 			{
766 750
 				if ($completed=='completed') {
767 751
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
768
-				}	else {
752
+				} else {
769 753
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
770 754
 					//echo "&nbsp;";
771 755
 				}
@@ -788,14 +772,12 @@  discard block
 block discarded – undo
788 772
 					if ($icon != 'wrap')
789 773
 					{
790 774
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
791
-					}
792
-					else
775
+					} else
793 776
 					{
794 777
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
795 778
 					}
796 779
 				}
797
-			}
798
-			else
780
+			} else
799 781
 			{
800 782
 				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>";
801 783
 			}
@@ -816,7 +798,7 @@  discard block
 block discarded – undo
816 798
 			if ($icon != 'nolink') {
817 799
 				if ($completed=='completed') {
818 800
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
819
-				}	else {
801
+				} else {
820 802
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
821 803
 					//echo "&nbsp;";
822 804
 				}
@@ -844,22 +826,19 @@  discard block
 block discarded – undo
844 826
 					if ($icon != 'wrap')
845 827
 					{
846 828
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
847
-					}
848
-					else
829
+					} else
849 830
 					{
850 831
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
851 832
 					}
852 833
 				} $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
853
-			}
854
-			else
834
+			} else
855 835
 			{
856 836
 				$enableDocumentParsing='yes';
857 837
 				if (!$enableDocumentParsing)
858 838
 				{ //this is the solution for the non-parsing version in the builder
859 839
 					$file=urlencode($myrow["path"]);
860 840
 					echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
861
-				}
862
-				else
841
+				} else
863 842
 				{
864 843
 					echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
865 844
 				}
@@ -879,7 +858,7 @@  discard block
 block discarded – undo
879 858
 			{
880 859
 				if ($completed=='completed') {
881 860
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
882
-				}	else {
861
+				} else {
883 862
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
884 863
 					//echo "&nbsp;";
885 864
 				}
@@ -901,14 +880,12 @@  discard block
 block discarded – undo
901 880
 					if ($icon != 'wrap')
902 881
 					{
903 882
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
904
-					}
905
-					else
883
+					} else
906 884
 					{
907 885
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
908 886
 					}
909 887
 				}
910
-			}
911
-			else
888
+			} else
912 889
 			{
913 890
 				echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
914 891
 			}
@@ -925,7 +902,7 @@  discard block
 block discarded – undo
925 902
 			if ($icon != 'nolink') {
926 903
 				if ($completed=='completed') {
927 904
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
928
-				}	else {
905
+				} else {
929 906
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
930 907
 					//echo "&nbsp;";
931 908
 				}
@@ -942,8 +919,7 @@  discard block
 block discarded – undo
942 919
 				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
943 920
 				if ($desc != '') {
944 921
 					if ($icon != 'wrap') {
945
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
946
-					else {
922
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
947 923
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
948 924
 				}
949 925
 			} else {
@@ -962,7 +938,7 @@  discard block
 block discarded – undo
962 938
 			if ($icon != 'nolink') {
963 939
 				if ($completed=='completed') {
964 940
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
965
-				}	else {
941
+				} else {
966 942
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
967 943
 					//echo "&nbsp;";
968 944
 				}
@@ -980,8 +956,7 @@  discard block
 block discarded – undo
980 956
 				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
981 957
 				if ($desc != '') {
982 958
 					if ($icon != 'wrap') {
983
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
984
-					else {
959
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
985 960
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
986 961
 				}
987 962
 			} else {
@@ -1001,7 +976,7 @@  discard block
 block discarded – undo
1001 976
 			if ($icon != 'nolink') {
1002 977
 				if ($completed=='completed') {
1003 978
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1004
-				}	else {
979
+				} else {
1005 980
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1006 981
 					//echo "&nbsp;";
1007 982
 				}
@@ -1018,8 +993,7 @@  discard block
 block discarded – undo
1018 993
 				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
1019 994
 				if ($desc != '') {
1020 995
 					if ($icon != 'wrap') {
1021
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1022
-					else {
996
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
1023 997
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1024 998
 				}
1025 999
 			} else {
@@ -1039,7 +1013,7 @@  discard block
 block discarded – undo
1039 1013
 			if ($icon != 'nolink') {
1040 1014
 				if ($completed=='completed') {
1041 1015
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1042
-				}	else {
1016
+				} else {
1043 1017
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1044 1018
 					//echo "&nbsp;";
1045 1019
 				}
@@ -1056,8 +1030,7 @@  discard block
 block discarded – undo
1056 1030
 				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
1057 1031
 				if ($desc != '') {
1058 1032
 					if ($icon != 'wrap') {
1059
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1060
-					else {
1033
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
1061 1034
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1062 1035
 				}
1063 1036
 			} else {
@@ -1076,7 +1049,7 @@  discard block
 block discarded – undo
1076 1049
 			if ($icon != 'nolink') {
1077 1050
 				if ($completed=='completed') {
1078 1051
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1079
-				}	else {
1052
+				} else {
1080 1053
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1081 1054
 					//echo "&nbsp;";
1082 1055
 				}
@@ -1093,8 +1066,7 @@  discard block
 block discarded – undo
1093 1066
 				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1094 1067
 				if ($desc != '') {
1095 1068
 					if ($icon != 'wrap') {
1096
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1097
-					else {
1069
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
1098 1070
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1099 1071
 				}
1100 1072
 			} else {
@@ -1144,8 +1116,7 @@  discard block
 block discarded – undo
1144 1116
 			if ($builder != 'builder')
1145 1117
 			{
1146 1118
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
1147
-			}
1148
-			else
1119
+			} else
1149 1120
 			{
1150 1121
 				$link .= "../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id";
1151 1122
 			}
@@ -1159,8 +1130,7 @@  discard block
 block discarded – undo
1159 1130
 			if ($builder != 'builder')
1160 1131
 			{
1161 1132
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$id#$id_in_path";
1162
-			}
1163
-			else
1133
+			} else
1164 1134
 			{
1165 1135
 				$link .= "../announcements/announcements.php?origin=$origin&ann_id=$id";
1166 1136
 			}
@@ -1178,8 +1148,7 @@  discard block
 block discarded – undo
1178 1148
 			if ($builder != 'builder')
1179 1149
 			{
1180 1150
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
1181
-			}
1182
-			else
1151
+			} else
1183 1152
 			{
1184 1153
 				$link .= $thelink;
1185 1154
 			}
@@ -1200,8 +1169,7 @@  discard block
 block discarded – undo
1200 1169
 			if ($builder != 'builder')
1201 1170
 			{
1202 1171
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
1203
-			}
1204
-			else
1172
+			} else
1205 1173
 			{
1206 1174
 				$link .= "../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"];
1207 1175
 			}
@@ -1222,8 +1190,7 @@  discard block
 block discarded – undo
1222 1190
 			if ($builder != 'builder')
1223 1191
 			{
1224 1192
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
1225
-			}
1226
-			else
1193
+			} else
1227 1194
 			{
1228 1195
 				$link .= "../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."";
1229 1196
 			}
@@ -1247,8 +1214,7 @@  discard block
 block discarded – undo
1247 1214
 			if ($builder != 'builder')
1248 1215
 			{
1249 1216
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
1250
-			}
1251
-			else
1217
+			} else
1252 1218
 			{
1253 1219
 				$link .= "../phpbb/viewforum.php?$forumparameters";
1254 1220
 			}
@@ -1269,8 +1235,7 @@  discard block
 block discarded – undo
1269 1235
 			if ($builder != 'builder')
1270 1236
 			{
1271 1237
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
1272
-			}
1273
-			else
1238
+			} else
1274 1239
 			{
1275 1240
 				$link .= "../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
1276 1241
 			}
@@ -1326,16 +1291,14 @@  discard block
 block discarded – undo
1326 1291
 			{
1327 1292
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
1328 1293
 
1329
-			}
1330
-			else
1294
+			} else
1331 1295
 			{
1332 1296
 				$enableDocumentParsing='yes';
1333 1297
 				if (!$enableDocumentParsing)
1334 1298
 				{ //this is the solution for the non-parsing version in the builder
1335 1299
 					$file=urlencode($myrow["path"]);
1336 1300
 					$link .= "../document/showinframes.php?file=$file";
1337
-				}
1338
-				else
1301
+				} else
1339 1302
 				{
1340 1303
 					$link .= "../document/download.php?doc_url=".$myrow["path"];
1341 1304
 				}
@@ -1346,8 +1309,7 @@  discard block
 block discarded – undo
1346 1309
 			if ($builder != 'builder')
1347 1310
 			{
1348 1311
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
1349
-			}
1350
-			else
1312
+			} else
1351 1313
 			{
1352 1314
 				$link .= "../work/work.php";
1353 1315
 			}
@@ -1472,11 +1434,12 @@  discard block
 block discarded – undo
1472 1434
 	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1473 1435
 	$result=Database::query($sql);
1474 1436
 	$number_added=Database::num_rows($result);
1475
-	if ($number_added<>0)
1476
-		return true;
1477
-	else
1478
-		return false;
1479
-}
1437
+	if ($number_added<>0) {
1438
+			return true;
1439
+	} else {
1440
+			return false;
1441
+	}
1442
+	}
1480 1443
 
1481 1444
 
1482 1445
 /**
@@ -1540,8 +1503,7 @@  discard block
 block discarded – undo
1540 1503
 		if ($origin != 'learnpath')
1541 1504
 		{
1542 1505
 			display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
1543
-		}
1544
-		else
1506
+		} else
1545 1507
 		{
1546 1508
 			display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
1547 1509
 		}
@@ -1616,8 +1578,7 @@  discard block
 block discarded – undo
1616 1578
 			//$_SESSION['edit']=='';
1617 1579
 		}
1618 1580
 		echo '</table>';
1619
-	}
1620
-	else // it is a string
1581
+	} else // it is a string
1621 1582
 	{
1622 1583
 		echo '';
1623 1584
 	}
@@ -1661,14 +1622,12 @@  discard block
 block discarded – undo
1661 1622
 			if ($type=="Document")
1662 1623
 			{
1663 1624
 				echo "<a href=".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".$lang_add_it_or_resource."</a>";
1664
-			}
1665
-			else
1625
+			} else
1666 1626
 			{
1667 1627
 				echo "<a href='".api_get_self()."?content=".$type."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
1668 1628
 			}
1669 1629
 		}
1670
-	}
1671
-	else // if it is not an array, it is a string
1630
+	} else // if it is not an array, it is a string
1672 1631
 	{
1673 1632
 		if ($_SESSION['addedresource']!==$type or $_SESSION['addedresourceid']!==$id)
1674 1633
 		{
Please login to merge, or discard this patch.
Indentation   +1387 added lines, -1387 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@  discard block
 block discarded – undo
24 24
 */
25 25
 
26 26
 function unset_session_resources() {
27
-	$_SESSION['addedresource']='';
28
-	$_SESSION['addedresourceid']='';
29
-	Session::erase('addedresource');
30
-	Session::erase('addedresourceid');
27
+    $_SESSION['addedresource']='';
28
+    $_SESSION['addedresourceid']='';
29
+    Session::erase('addedresource');
30
+    Session::erase('addedresourceid');
31 31
 }
32 32
 
33 33
 /**
@@ -35,24 +35,24 @@  discard block
 block discarded – undo
35 35
  */
36 36
 function show_folder_up()
37 37
 {
38
-	global $folder;
39
-	global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
40
-
41
-	$level = get_levels($folder);
42
-
43
-	if ($level == 1)
44
-	{
45
-		echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
46
-	}
47
-	if ($level and $level != 0 and $level != 1)
48
-	{
49
-		$folder_up=$folder;
50
-		$folder_temp=explode('/',$folder);
51
-		$last=count($folder_temp)-1;
52
-		unset($folder_temp[$last]);
53
-		$folder_up=implode('/',$folder_temp);
54
-		echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;folder=$folder_up&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
55
-	}
38
+    global $folder;
39
+    global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
40
+
41
+    $level = get_levels($folder);
42
+
43
+    if ($level == 1)
44
+    {
45
+        echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
46
+    }
47
+    if ($level and $level != 0 and $level != 1)
48
+    {
49
+        $folder_up=$folder;
50
+        $folder_temp=explode('/',$folder);
51
+        $last=count($folder_temp)-1;
52
+        unset($folder_temp[$last]);
53
+        $folder_up=implode('/',$folder_temp);
54
+        echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;folder=$folder_up&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
55
+    }
56 56
 }
57 57
 
58 58
 /**
@@ -61,23 +61,23 @@  discard block
 block discarded – undo
61 61
  */
62 62
 function show_documents($folder)
63 63
 {
64
-	global $_course;
65
-	global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
66
-
67
-	// documents are a special case: the teacher can add an invisible document (it will be viewable by the user)
68
-	// other tools do not have this feature. This only counts
69
-	if (api_is_allowed_to_edit())
70
-	{
71
-		$visibility="ip.visibility<>'2'";
72
-	}
73
-	else
74
-	{
75
-		$visibility="ip.visibility='1'";
76
-	}
77
-
78
-	$item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
79
-	$document_table = Database::get_course_table(TABLE_DOCUMENT);
80
-	$sql = "SELECT * from $document_table docs, $item_property_table ip
64
+    global $_course;
65
+    global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
66
+
67
+    // documents are a special case: the teacher can add an invisible document (it will be viewable by the user)
68
+    // other tools do not have this feature. This only counts
69
+    if (api_is_allowed_to_edit())
70
+    {
71
+        $visibility="ip.visibility<>'2'";
72
+    }
73
+    else
74
+    {
75
+        $visibility="ip.visibility='1'";
76
+    }
77
+
78
+    $item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
79
+    $document_table = Database::get_course_table(TABLE_DOCUMENT);
80
+    $sql = "SELECT * from $document_table docs, $item_property_table ip
81 81
 			WHERE
82 82
 			    docs.id=ip.ref AND
83 83
 			    ip.tool = '".TOOL_DOCUMENT."' AND
@@ -85,104 +85,104 @@  discard block
 block discarded – undo
85 85
 			    (ip.to_group_id = 0 OR i.to_group_id IS NULL) AND
86 86
 			    ip.to_user_id IS NULL
87 87
 			ORDER BY docs.path ASC";
88
-	$result=Database::query($sql);
89
-	while ($row=Database::fetch_array($result))
90
-	{
91
-		if (!$folder)
92
-		{
93
-			if (get_levels($row['path'])-1==1)
94
-			{
95
-				// showing the right icon
96
-				if (file_or_folder($row['path']))
97
-				{
98
-						echo '<img src="../img/file.gif" align="middle" />';
99
-				}
100
-				else
101
-				{
102
-					$image = choose_image($row['path']);
103
-					echo "<img src=\"../img/$image\" align=\"middle\" />";
104
-				}
105
-
106
-				// folders should be clickable
107
-				if (file_or_folder($row['path']))
108
-				{
109
-					echo "<a href='".api_get_self()."?content=Document";
110
-					echo "&amp;folder=".substr($row['path'],1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'],1).'</a><br />';
111
-				}
112
-				else
113
-				{
114
-					echo substr($row['path'],1).' ';
115
-					echo showorhide_addresourcelink('Document',$row['id']);
116
-					echo '<br />';
117
-				}
118
-			}
119
-		}
120
-		else
121
-		{
122
-			// we calculate the level we are in by using the $folder in the url
123
-			// we put +1 because it does not start with an / and in the database it does
124
-			$level=get_levels($folder)+1;
125
-
126
-			// we calculate each level of the database entry
127
-			$file_level=get_levels($row['path'])-1;
128
-			// if the level of the database entry is equal to the level we ar in, we put it into an array
129
-			// as this is a potential good entry
130
-			if ($file_level==$level)
131
-			{
132
-				$good_paths[]=$row['path'];
133
-				$good_ids[]=$row['id'];
134
-			}
135
-			//$haystack=$row['path'];
136
-			//$conform_folder=strstr($haystack, $folder);
137
-			//if (str_replace($folder.'/','',$conform_folder)!==$folder)
138
-			//	{
139
-			//	$good_folders[]=$row['path'];
140
-				//echo str_replace($folder.'/','',$conform_folder);
141
-			//	echo '<br />';
142
-			//	}// if (str_replace($folder.'/','',$conform_folder)!==$folder)
143
-		} // else (if (!$folder))
144
-	} //while ($row=Database::fetch_array($result))
145
-
146
-	// this is code for the case that we are in a subfolder
147
-	if ($good_paths)
148
-	{
149
-		// we have all the potential good database entries, the good ones are those that start with $folder
150
-		foreach ($good_paths as $path)
151
-		{
152
-			if (strstr($path,$folder))
153
-			{
154
-				$good_key=key($good_paths);
155
-				// showing the right icon
156
-				if (file_or_folder($path))
157
-				{
158
-					echo '<img src="../img/file.gif" align="middle" />';
159
-				}
160
-				else
161
-				{
162
-					$image = choose_image($path);
163
-					echo "<img src=\"../img/$image\" align=\"middle\" />";
164
-				}
165
-
166
-				// folders should be clickable
167
-				if (file_or_folder($path))
168
-				{
169
-					$path=substr($path,1); // remove the first / in folder_up
170
-					$uri=str_replace($folder,$path,$_SERVER['REQUEST_URI']);
171
-					$newuri=str_replace('add=','addnot=',$uri);
172
-					//using the correct name of the folder
173
-					$folder_name=str_replace($folder.'/','',$path);
174
-					echo "<a href='$newuri'>".$folder_name.'</a><br />';
175
-				}
176
-				else
177
-				{
178
-					echo str_replace("/$folder/", '',$path).' ';
179
-					echo showorhide_addresourcelink('Document',$good_ids[$good_key]);
180
-					echo '<br />';
181
-				}
182
-			}
183
-			next($good_paths);
184
-		}
185
-	}
88
+    $result=Database::query($sql);
89
+    while ($row=Database::fetch_array($result))
90
+    {
91
+        if (!$folder)
92
+        {
93
+            if (get_levels($row['path'])-1==1)
94
+            {
95
+                // showing the right icon
96
+                if (file_or_folder($row['path']))
97
+                {
98
+                        echo '<img src="../img/file.gif" align="middle" />';
99
+                }
100
+                else
101
+                {
102
+                    $image = choose_image($row['path']);
103
+                    echo "<img src=\"../img/$image\" align=\"middle\" />";
104
+                }
105
+
106
+                // folders should be clickable
107
+                if (file_or_folder($row['path']))
108
+                {
109
+                    echo "<a href='".api_get_self()."?content=Document";
110
+                    echo "&amp;folder=".substr($row['path'],1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'],1).'</a><br />';
111
+                }
112
+                else
113
+                {
114
+                    echo substr($row['path'],1).' ';
115
+                    echo showorhide_addresourcelink('Document',$row['id']);
116
+                    echo '<br />';
117
+                }
118
+            }
119
+        }
120
+        else
121
+        {
122
+            // we calculate the level we are in by using the $folder in the url
123
+            // we put +1 because it does not start with an / and in the database it does
124
+            $level=get_levels($folder)+1;
125
+
126
+            // we calculate each level of the database entry
127
+            $file_level=get_levels($row['path'])-1;
128
+            // if the level of the database entry is equal to the level we ar in, we put it into an array
129
+            // as this is a potential good entry
130
+            if ($file_level==$level)
131
+            {
132
+                $good_paths[]=$row['path'];
133
+                $good_ids[]=$row['id'];
134
+            }
135
+            //$haystack=$row['path'];
136
+            //$conform_folder=strstr($haystack, $folder);
137
+            //if (str_replace($folder.'/','',$conform_folder)!==$folder)
138
+            //	{
139
+            //	$good_folders[]=$row['path'];
140
+                //echo str_replace($folder.'/','',$conform_folder);
141
+            //	echo '<br />';
142
+            //	}// if (str_replace($folder.'/','',$conform_folder)!==$folder)
143
+        } // else (if (!$folder))
144
+    } //while ($row=Database::fetch_array($result))
145
+
146
+    // this is code for the case that we are in a subfolder
147
+    if ($good_paths)
148
+    {
149
+        // we have all the potential good database entries, the good ones are those that start with $folder
150
+        foreach ($good_paths as $path)
151
+        {
152
+            if (strstr($path,$folder))
153
+            {
154
+                $good_key=key($good_paths);
155
+                // showing the right icon
156
+                if (file_or_folder($path))
157
+                {
158
+                    echo '<img src="../img/file.gif" align="middle" />';
159
+                }
160
+                else
161
+                {
162
+                    $image = choose_image($path);
163
+                    echo "<img src=\"../img/$image\" align=\"middle\" />";
164
+                }
165
+
166
+                // folders should be clickable
167
+                if (file_or_folder($path))
168
+                {
169
+                    $path=substr($path,1); // remove the first / in folder_up
170
+                    $uri=str_replace($folder,$path,$_SERVER['REQUEST_URI']);
171
+                    $newuri=str_replace('add=','addnot=',$uri);
172
+                    //using the correct name of the folder
173
+                    $folder_name=str_replace($folder.'/','',$path);
174
+                    echo "<a href='$newuri'>".$folder_name.'</a><br />';
175
+                }
176
+                else
177
+                {
178
+                    echo str_replace("/$folder/", '',$path).' ';
179
+                    echo showorhide_addresourcelink('Document',$good_ids[$good_key]);
180
+                    echo '<br />';
181
+                }
182
+            }
183
+            next($good_paths);
184
+        }
185
+    }
186 186
 }
187 187
 
188 188
 /**
@@ -193,13 +193,13 @@  discard block
 block discarded – undo
193 193
  */
194 194
 function file_or_folder($filefolder)
195 195
 {
196
-	global $_course;
197
-	global $baseServDir;
196
+    global $_course;
197
+    global $baseServDir;
198 198
 
199
-	$courseDir   = $_course['path'].'/document';
200
-	$baseWorkDir = api_get_path(SYS_COURSE_PATH).$courseDir;
199
+    $courseDir   = $_course['path'].'/document';
200
+    $baseWorkDir = api_get_path(SYS_COURSE_PATH).$courseDir;
201 201
 
202
-	return (is_dir($baseWorkDir.$filefolder) ? 1 : 0);
202
+    return (is_dir($baseWorkDir.$filefolder) ? 1 : 0);
203 203
 }
204 204
 
205 205
 /**
@@ -210,23 +210,23 @@  discard block
 block discarded – undo
210 210
  */
211 211
 function store_resources($source_type, $source_id)
212 212
 {
213
-	global $_course;
214
-	$resource_table = Database::get_course_table(TABLE_LINKED_RESOURCES);
215
-
216
-	$addedresource = $_SESSION['addedresource'];
217
-	$addedresourceid = $_SESSION['addedresourceid'];
218
-	if ($_SESSION['addedresource'])
219
-	{
220
-		foreach ($addedresource as $resource_type)
221
-		{
222
-			$sql="INSERT INTO $resource_table (source_type, source_id, resource_type, resource_id) VALUES ('$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
223
-			Database::query($sql);
224
-			$i=key($addedresource);
225
-			next($addedresource);
226
-		}
227
-		$_SESSION['addedresource']='';
228
-		$_SESSION['addedresourceid']='';
229
-	}
213
+    global $_course;
214
+    $resource_table = Database::get_course_table(TABLE_LINKED_RESOURCES);
215
+
216
+    $addedresource = $_SESSION['addedresource'];
217
+    $addedresourceid = $_SESSION['addedresourceid'];
218
+    if ($_SESSION['addedresource'])
219
+    {
220
+        foreach ($addedresource as $resource_type)
221
+        {
222
+            $sql="INSERT INTO $resource_table (source_type, source_id, resource_type, resource_id) VALUES ('$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
223
+            Database::query($sql);
224
+            $i=key($addedresource);
225
+            next($addedresource);
226
+        }
227
+        $_SESSION['addedresource']='';
228
+        $_SESSION['addedresourceid']='';
229
+    }
230 230
 }
231 231
 
232 232
 /**
@@ -240,87 +240,87 @@  discard block
 block discarded – undo
240 240
  */
241 241
 function display_addedresource_link($type, $id, $style='')
242 242
 {
243
-	global $_course;
243
+    global $_course;
244 244
 
245
-	// styling the link of the added resource
246
-	if ($style <> '')
247
-	{
248
-		$styling = ' class="'.$style.'"';
249
-	}
245
+    // styling the link of the added resource
246
+    if ($style <> '')
247
+    {
248
+        $styling = ' class="'.$style.'"';
249
+    }
250 250
 
251 251
     $course_id = api_get_course_int_id();
252 252
 
253
-	switch ($type)
254
-	{
255
-		case 'Agenda':
256
-			$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
257
-			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE c_id = $course_id AND id=$id");
258
-			$myrow = Database::fetch_array($result);
259
-			echo '<img src="../img/agenda.gif" align="middle" /> <a href="../calendar/agenda.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
260
-			break;
261
-		case 'Ad_Valvas':
262
-			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
263
-			$result = Database::query("SELECT * FROM $tbl_announcement WHERE c_id = $course_id AND id=$id");
264
-			$myrow = Database::fetch_array($result);
265
-			echo '<img src="../img/valves.gif" align="middle" /> <a href="../announcements/announcements.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
266
-			break;
267
-		case 'Link':Database::get_course_table(TABLE_LINK);
268
-			$result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
269
-			$myrow = Database::fetch_array($result);
270
-			echo '<img src="../img/links.gif" align="middle" /> <a href="#" onclick="javascript:window.open(\'../link/link_goto.php?link_id='.$myrow['id'].'&amp;link_url='.urlencode($myrow['url'])."','MyWindow','width=500,height=400,top='+((screen.height-400)/2)+',left='+((screen.width-500)/2)+',scrollbars=1,resizable=1,menubar=1'); return false;\"".$styling.'>'.$myrow['title']."</a><br />\n";
271
-			break;
272
-		case 'Exercise':
273
-			$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
274
-			$result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND  id=$id");
275
-			$myrow = Database::fetch_array($result);
276
-			echo '<img src="../img/quiz.gif" align="middle" /> <a href="../exercice/exercise_submit.php?exerciseId='.$myrow['id'].'"'.$styling.'>'.$myrow['title']."</a><br />\n";
277
-			break;
278
-		case 'Forum':
279
-			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
280
-			$result = Database::query("SELECT * FROM $TBL_FORUMS WHERE c_id = $course_id AND forum_id=$id");
281
-			$myrow = Database::fetch_array($result);
282
-			echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewforum.php?forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow['forum_name']."</a><br />\n";
283
-			break;
284
-		case 'Thread':  //=topics
253
+    switch ($type)
254
+    {
255
+        case 'Agenda':
256
+            $TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
257
+            $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE c_id = $course_id AND id=$id");
258
+            $myrow = Database::fetch_array($result);
259
+            echo '<img src="../img/agenda.gif" align="middle" /> <a href="../calendar/agenda.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
260
+            break;
261
+        case 'Ad_Valvas':
262
+            $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
263
+            $result = Database::query("SELECT * FROM $tbl_announcement WHERE c_id = $course_id AND id=$id");
264
+            $myrow = Database::fetch_array($result);
265
+            echo '<img src="../img/valves.gif" align="middle" /> <a href="../announcements/announcements.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
266
+            break;
267
+        case 'Link':Database::get_course_table(TABLE_LINK);
268
+            $result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
269
+            $myrow = Database::fetch_array($result);
270
+            echo '<img src="../img/links.gif" align="middle" /> <a href="#" onclick="javascript:window.open(\'../link/link_goto.php?link_id='.$myrow['id'].'&amp;link_url='.urlencode($myrow['url'])."','MyWindow','width=500,height=400,top='+((screen.height-400)/2)+',left='+((screen.width-500)/2)+',scrollbars=1,resizable=1,menubar=1'); return false;\"".$styling.'>'.$myrow['title']."</a><br />\n";
271
+            break;
272
+        case 'Exercise':
273
+            $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
274
+            $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND  id=$id");
275
+            $myrow = Database::fetch_array($result);
276
+            echo '<img src="../img/quiz.gif" align="middle" /> <a href="../exercice/exercise_submit.php?exerciseId='.$myrow['id'].'"'.$styling.'>'.$myrow['title']."</a><br />\n";
277
+            break;
278
+        case 'Forum':
279
+            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
280
+            $result = Database::query("SELECT * FROM $TBL_FORUMS WHERE c_id = $course_id AND forum_id=$id");
281
+            $myrow = Database::fetch_array($result);
282
+            echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewforum.php?forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow['forum_name']."</a><br />\n";
283
+            break;
284
+        case 'Thread':  //=topics
285 285
         //deprecated
286
-			$tbl_posts		= $_course['dbNameGlu'].'bb_posts';
287
-			$tbl_posts_text	= $_course['dbNameGlu'].'bb_posts_text';
288
-			$TBL_FORUMS		= $_course['dbNameGlu'].'bb_forums';
289
-			$result = Database::query("SELECT * FROM $tbl_posts posts, $TBL_FORUMS forum WHERE forum.forum_id=posts.forum_id and post_id=$id");
290
-			$myrow = Database::fetch_array($result);
291
-			// grabbing the title of the post
292
-			$sql_title = "SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
293
-			$result_title = Database::query($sql_title);
294
-			$myrow_title = Database::fetch_array($result_title);
295
-			echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$myrow['topic_id'].'&amp;forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow_title['post_title']."</a><br />\n";
296
-			break;
297
-		case 'Post':
286
+            $tbl_posts		= $_course['dbNameGlu'].'bb_posts';
287
+            $tbl_posts_text	= $_course['dbNameGlu'].'bb_posts_text';
288
+            $TBL_FORUMS		= $_course['dbNameGlu'].'bb_forums';
289
+            $result = Database::query("SELECT * FROM $tbl_posts posts, $TBL_FORUMS forum WHERE forum.forum_id=posts.forum_id and post_id=$id");
290
+            $myrow = Database::fetch_array($result);
291
+            // grabbing the title of the post
292
+            $sql_title = "SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
293
+            $result_title = Database::query($sql_title);
294
+            $myrow_title = Database::fetch_array($result_title);
295
+            echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$myrow['topic_id'].'&amp;forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow_title['post_title']."</a><br />\n";
296
+            break;
297
+        case 'Post':
298 298
         //deprecated
299
-			$tbl_post = Database::get_course_table(TABLE_FORUM_POST);
300
-			$tbl_post_text = Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
301
-			$sql = "SELECT * FROM $tbl_post p, $tbl_post_text t WHERE p.post_id = t.post_id AND p.post_id = $id";
302
-			$result = Database::query($sql);
303
-			$post = Database::fetch_object($result);
304
-			echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$post->topic_id.'&amp;forum='.$post->forum_id.'"'.$styling.'>'.$post->post_title."</a><br />\n";
305
-			break;
306
-		case 'Document':
307
-			$dbTable = Database::get_course_table(TABLE_DOCUMENT);
308
-			$result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
309
-			$myrow = Database::fetch_array($result);
310
-			$pathname = explode('/',$myrow['path']); // making a correct name for the link
311
-			$last = count($pathname) - 1;  // making a correct name for the link
312
-			$filename = $pathname[$last];  // making a correct name for the link
313
-			$image = choose_image($filename);
314
-			$ext = explode('.',$filename);
315
-			$ext = strtolower($ext[sizeof($ext)-1]);
316
-			$myrow['path'] = rawurlencode($myrow['path']);
317
-			$in_frames = in_array($ext, array('htm','html','gif','jpg','jpeg','png'));
318
-			echo '<img src="../img/'.$image.'" align="middle" /> <a href="../document/'.($in_frames ? 'showinframes.php?file=' : 'download.php?doc_url=').$myrow['path'].'"'.$styling.'>'.$filename."</a><br />\n";
319
-			break;
320
-		case 'Externallink':
321
-			echo '<img src="../img/links.gif" align="middle" /> <a href="'.$id.'"'.$styling.'>'.$id."</a><br />\n";
322
-			break;
323
-	}
299
+            $tbl_post = Database::get_course_table(TABLE_FORUM_POST);
300
+            $tbl_post_text = Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
301
+            $sql = "SELECT * FROM $tbl_post p, $tbl_post_text t WHERE p.post_id = t.post_id AND p.post_id = $id";
302
+            $result = Database::query($sql);
303
+            $post = Database::fetch_object($result);
304
+            echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$post->topic_id.'&amp;forum='.$post->forum_id.'"'.$styling.'>'.$post->post_title."</a><br />\n";
305
+            break;
306
+        case 'Document':
307
+            $dbTable = Database::get_course_table(TABLE_DOCUMENT);
308
+            $result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
309
+            $myrow = Database::fetch_array($result);
310
+            $pathname = explode('/',$myrow['path']); // making a correct name for the link
311
+            $last = count($pathname) - 1;  // making a correct name for the link
312
+            $filename = $pathname[$last];  // making a correct name for the link
313
+            $image = choose_image($filename);
314
+            $ext = explode('.',$filename);
315
+            $ext = strtolower($ext[sizeof($ext)-1]);
316
+            $myrow['path'] = rawurlencode($myrow['path']);
317
+            $in_frames = in_array($ext, array('htm','html','gif','jpg','jpeg','png'));
318
+            echo '<img src="../img/'.$image.'" align="middle" /> <a href="../document/'.($in_frames ? 'showinframes.php?file=' : 'download.php?doc_url=').$myrow['path'].'"'.$styling.'>'.$filename."</a><br />\n";
319
+            break;
320
+        case 'Externallink':
321
+            echo '<img src="../img/links.gif" align="middle" /> <a href="'.$id.'"'.$styling.'>'.$id."</a><br />\n";
322
+            break;
323
+    }
324 324
 }
325 325
 
326 326
 /**
@@ -342,766 +342,766 @@  discard block
 block discarded – undo
342 342
 */
343 343
 function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0)
344 344
 {
345
-	global $learnpath_id, $tbl_learnpath_item, $items;
346
-	global $_course, $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid;
347
-
348
-	$hyperlink_target_parameter = ''; //or e.g. 'target="_blank"'
349
-
350
-	$length = ((($builder == 'builder') and ($icon == 'nolink')) ? 65 : 32);
351
-
352
-	if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
353
-	$linktype = $type;
354
-	if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
355
-
356
-	switch ($type)
357
-	{
358
-		case "Agenda":
359
-			$TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);
360
-			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
361
-			$myrow=Database::fetch_array($result);
362
-
363
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
364
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
365
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
366
-			$desc=$row['description'];
367
-			$agenda_id=$row['item_id'];
368
-			echo str_repeat("&nbsp;&gt;",$level);
369
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
370
-			if ($icon != 'nolink')
371
-			{
372
-				if ($completed=='completed') {
373
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
374
-				}	else {
375
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
376
-					//echo "&nbsp;";
377
-				}
378
-			}
379
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
380
-
381
-			if ($myrow["title"]=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
382
-
383
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
384
-			if ($icon == 'icon') { echo "<img src='../img/agenda.gif' align=\"absmiddle\" alt='agenda'>"; }
385
-			if ($builder != 'builder')
386
-			{
387
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
388
-        		$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
389
-				if ($desc != '')
390
-				{
391
-					if ($icon != 'wrap')
392
-					{
393
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
394
-					}
395
-					else
396
-					{
397
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
398
-					}
399
-				}
400
-			}
401
-			else
402
-			{
403
-				echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
404
-			}
405
-			break;
406
-
407
-		case "Ad_Valvas":
408
-			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
409
-			$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
410
-			$myrow=Database::fetch_array($result);
411
-
412
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
413
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
414
-			if ($row['title'] != '') { $myrow["content"]=$row['title']; }
415
-			$desc=$row['description'];
416
-			$ann_id=$row['item_id'];
417
-			echo str_repeat("&nbsp;&gt;",$level);
418
-
419
-			// the title and the text are in the content field and we only want to display the title
420
-			list($title, $text)=split('<br>',$myrow['content']);
421
-			if ($title=='') { $title=$myrow['content']; }
422
-			$title=$myrow['title'];
423
-			$text=$myrow['content'];
424
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
425
-			if ($icon != 'nolink')
426
-			{
427
-				if ($completed=='completed') {
428
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
429
-				}	else {
430
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
431
-					//echo "&nbsp;";
432
-				}
433
-			}
434
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
435
-
436
-			if ($title=='') {
437
-				$type="Announcement";
438
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
439
-				return(true);
440
-			}
441
-
442
-			if ($icon == 'nolink') { return(shorten($title,$length)); }
443
-			if ($icon == 'icon') { echo "<img src='../img/valves.gif' align=\"absmiddle\" alt='ad valvas'>"; }
444
-			if ($builder != 'builder')
445
-			{
446
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title,($length-3*$level))."</a>";
447
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
448
-				if ($desc != '')
449
-				{
450
-					if ($icon != 'wrap')
451
-					{
452
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
453
-					}
454
-					else
455
-					{
456
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
457
-					}
458
-				}
459
-			}
460
-			else
461
-			{
462
-				echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title,($length-3*$level))."</a>";
463
-			}
464
-			break;
465
-
466
-		case "Link" :
467
-			$TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
468
-			$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
469
-			$myrow=Database::fetch_array($result);
470
-
471
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
472
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
473
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
474
-			$desc=$row['description'];
475
-			echo str_repeat("&nbsp;&gt;",$level);
476
-
477
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
478
-			if ($icon != 'nolink')
479
-			{
480
-				if ($completed=='completed') {
481
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
482
-				}	else {
483
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
484
-					//echo "&nbsp;";
485
-				}
486
-			}
487
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
488
-
489
-			if ($myrow["title"]=='')
490
-			{
491
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
492
-				return(true);
493
-			}
494
-
495
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
496
-			if ($icon == 'icon')
497
-			{
498
-				if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
499
-				   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
500
-			}
501
-			$thelink=$myrow["url"];
502
-			if ($builder != 'builder')
503
-			{
504
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
505
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
506
-				if ($desc != '')
507
-				{
508
-					if ($icon != 'wrap')
509
-					{
510
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
511
-					}
512
-					else
513
-					{
514
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
515
-					}
516
-				}
517
-			}
518
-			else
519
-			{
520
-				echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
521
-			}
522
-			break;
523
-
524
-		case "Exercise":
525
-			$TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
526
-			$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
527
-			$myrow=Database::fetch_array($result);
528
-
529
-			if ($builder=='builder') { $origin='builder'; }
530
-			  //this is needed for the exercise_submit.php can delete the session info about tests
531
-
532
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
533
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
534
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
535
-			$desc=$row['description'];
536
-			echo str_repeat("&nbsp;&gt;",$level);
537
-
538
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
539
-			if ($icon != 'nolink')
540
-			{
541
-				if ($completed=='completed') {
542
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
543
-				}	else {
544
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
545
-					//echo "&nbsp;";
546
-				}
547
-			}
548
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
549
-
550
-			if ($myrow["title"]=='') {
551
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
552
-				return(true);
553
-			}
554
-
555
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
556
-			if ($icon == 'icon') { echo "<img src='../img/quiz.gif' align=\"absmiddle\" alt='quizz'>"; }
557
-			if ($builder != 'builder')
558
-			{
559
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
560
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
561
-				if ($desc != '')
562
-				{
563
-					if ($icon != 'wrap')
564
-					{
565
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
566
-					}
567
-					else
568
-					{
569
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
570
-					}
571
-				}
572
-			}
573
-			else
574
-			{
575
-				echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
576
-			}
577
-			break;
578
-
579
-		case "HotPotatoes":
580
-			$TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
581
-			$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
582
-			$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
583
-			$myrow= Database::fetch_array($result);
584
-			$path=$myrow["path"];
585
-			$name=GetQuizName($path,$documentPath);
586
-
587
-			if ($builder=='builder') { $origin='builder'; }
588
-			  //this is needed for the exercise_submit.php can delete the session info about tests
589
-
590
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
591
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
592
-			if ($row['title'] != '') { $name=$row['title']; }
593
-			$desc=$row['description'];
594
-			echo str_repeat("&nbsp;&gt;",$level);
595
-
596
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
597
-			if ($icon != 'nolink')
598
-			{
599
-				if ($completed=='completed') {
600
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
601
-				}	else {
602
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
603
-					//echo "&nbsp;";
604
-				}
605
-			}
606
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
607
-
608
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
609
-
610
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
611
-			if ($icon == 'icon') { echo "<img src='../img/jqz.gif' align=\"absmiddle\" alt='hot potatoes'>"; }
612
-
613
-			$cid = $_course['official_code'];
614
-
615
-			if ($builder != 'builder')
616
-			{
617
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
618
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
619
-				if ($desc != '')
620
-				{
621
-					if ($icon != 'wrap')
622
-					{
623
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
624
-					}
625
-					else
626
-					{
627
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
628
-					}
629
-				}
630
-			}
631
-			else
632
-			{
633
-				echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
634
-			}
635
-			break;
636
-
637
-		case "Forum":
638
-			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
639
-			$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
640
-			$myrow=Database::fetch_array($result);
641
-
642
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
643
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
644
-			if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
645
-			$desc=$row['description'];
646
-			echo str_repeat("&nbsp;&gt;",$level);
647
-
648
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
649
-			if ($icon != 'nolink')
650
-			{
651
-				if ($completed=='completed') {
652
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
653
-				}	else {
654
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
655
-					//echo "&nbsp;";
656
-				}
657
-			}
658
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
659
-
660
-			if ($myrow["forum_name"]=='') { $type="Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
661
-
662
-			if ($icon == 'nolink') { return(shorten($myrow["forum_name"],$length)); }
663
-			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
664
-			$forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
665
-			if ($builder != 'builder')
666
-			{
667
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
668
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
669
-				if ($desc != '')
670
-				{
671
-					if ($icon != 'wrap')
672
-					{
673
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
674
-					}
675
-					else
676
-					{
677
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
678
-					}
679
-				}
680
-			}
681
-			else
682
-			{
683
-				echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
684
-			}
685
-			break;
686
-
687
-		case "Thread":  //forum post
345
+    global $learnpath_id, $tbl_learnpath_item, $items;
346
+    global $_course, $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid;
347
+
348
+    $hyperlink_target_parameter = ''; //or e.g. 'target="_blank"'
349
+
350
+    $length = ((($builder == 'builder') and ($icon == 'nolink')) ? 65 : 32);
351
+
352
+    if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
353
+    $linktype = $type;
354
+    if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
355
+
356
+    switch ($type)
357
+    {
358
+        case "Agenda":
359
+            $TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);
360
+            $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
361
+            $myrow=Database::fetch_array($result);
362
+
363
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
364
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
365
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
366
+            $desc=$row['description'];
367
+            $agenda_id=$row['item_id'];
368
+            echo str_repeat("&nbsp;&gt;",$level);
369
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
370
+            if ($icon != 'nolink')
371
+            {
372
+                if ($completed=='completed') {
373
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
374
+                }	else {
375
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
376
+                    //echo "&nbsp;";
377
+                }
378
+            }
379
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
380
+
381
+            if ($myrow["title"]=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
382
+
383
+            if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
384
+            if ($icon == 'icon') { echo "<img src='../img/agenda.gif' align=\"absmiddle\" alt='agenda'>"; }
385
+            if ($builder != 'builder')
386
+            {
387
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
388
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
389
+                if ($desc != '')
390
+                {
391
+                    if ($icon != 'wrap')
392
+                    {
393
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
394
+                    }
395
+                    else
396
+                    {
397
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
398
+                    }
399
+                }
400
+            }
401
+            else
402
+            {
403
+                echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
404
+            }
405
+            break;
406
+
407
+        case "Ad_Valvas":
408
+            $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
409
+            $result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
410
+            $myrow=Database::fetch_array($result);
411
+
412
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
413
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
414
+            if ($row['title'] != '') { $myrow["content"]=$row['title']; }
415
+            $desc=$row['description'];
416
+            $ann_id=$row['item_id'];
417
+            echo str_repeat("&nbsp;&gt;",$level);
418
+
419
+            // the title and the text are in the content field and we only want to display the title
420
+            list($title, $text)=split('<br>',$myrow['content']);
421
+            if ($title=='') { $title=$myrow['content']; }
422
+            $title=$myrow['title'];
423
+            $text=$myrow['content'];
424
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
425
+            if ($icon != 'nolink')
426
+            {
427
+                if ($completed=='completed') {
428
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
429
+                }	else {
430
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
431
+                    //echo "&nbsp;";
432
+                }
433
+            }
434
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
435
+
436
+            if ($title=='') {
437
+                $type="Announcement";
438
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
439
+                return(true);
440
+            }
441
+
442
+            if ($icon == 'nolink') { return(shorten($title,$length)); }
443
+            if ($icon == 'icon') { echo "<img src='../img/valves.gif' align=\"absmiddle\" alt='ad valvas'>"; }
444
+            if ($builder != 'builder')
445
+            {
446
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title,($length-3*$level))."</a>";
447
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
448
+                if ($desc != '')
449
+                {
450
+                    if ($icon != 'wrap')
451
+                    {
452
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
453
+                    }
454
+                    else
455
+                    {
456
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
457
+                    }
458
+                }
459
+            }
460
+            else
461
+            {
462
+                echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title,($length-3*$level))."</a>";
463
+            }
464
+            break;
465
+
466
+        case "Link" :
467
+            $TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
468
+            $result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
469
+            $myrow=Database::fetch_array($result);
470
+
471
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
472
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
473
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
474
+            $desc=$row['description'];
475
+            echo str_repeat("&nbsp;&gt;",$level);
476
+
477
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
478
+            if ($icon != 'nolink')
479
+            {
480
+                if ($completed=='completed') {
481
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
482
+                }	else {
483
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
484
+                    //echo "&nbsp;";
485
+                }
486
+            }
487
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
488
+
489
+            if ($myrow["title"]=='')
490
+            {
491
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
492
+                return(true);
493
+            }
494
+
495
+            if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
496
+            if ($icon == 'icon')
497
+            {
498
+                if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
499
+                    else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
500
+            }
501
+            $thelink=$myrow["url"];
502
+            if ($builder != 'builder')
503
+            {
504
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
505
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
506
+                if ($desc != '')
507
+                {
508
+                    if ($icon != 'wrap')
509
+                    {
510
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
511
+                    }
512
+                    else
513
+                    {
514
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
515
+                    }
516
+                }
517
+            }
518
+            else
519
+            {
520
+                echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
521
+            }
522
+            break;
523
+
524
+        case "Exercise":
525
+            $TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
526
+            $result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
527
+            $myrow=Database::fetch_array($result);
528
+
529
+            if ($builder=='builder') { $origin='builder'; }
530
+                //this is needed for the exercise_submit.php can delete the session info about tests
531
+
532
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
533
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
534
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
535
+            $desc=$row['description'];
536
+            echo str_repeat("&nbsp;&gt;",$level);
537
+
538
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
539
+            if ($icon != 'nolink')
540
+            {
541
+                if ($completed=='completed') {
542
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
543
+                }	else {
544
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
545
+                    //echo "&nbsp;";
546
+                }
547
+            }
548
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
549
+
550
+            if ($myrow["title"]=='') {
551
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
552
+                return(true);
553
+            }
554
+
555
+            if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
556
+            if ($icon == 'icon') { echo "<img src='../img/quiz.gif' align=\"absmiddle\" alt='quizz'>"; }
557
+            if ($builder != 'builder')
558
+            {
559
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
560
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
561
+                if ($desc != '')
562
+                {
563
+                    if ($icon != 'wrap')
564
+                    {
565
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
566
+                    }
567
+                    else
568
+                    {
569
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
570
+                    }
571
+                }
572
+            }
573
+            else
574
+            {
575
+                echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
576
+            }
577
+            break;
578
+
579
+        case "HotPotatoes":
580
+            $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
581
+            $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
582
+            $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
583
+            $myrow= Database::fetch_array($result);
584
+            $path=$myrow["path"];
585
+            $name=GetQuizName($path,$documentPath);
586
+
587
+            if ($builder=='builder') { $origin='builder'; }
588
+                //this is needed for the exercise_submit.php can delete the session info about tests
589
+
590
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
591
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
592
+            if ($row['title'] != '') { $name=$row['title']; }
593
+            $desc=$row['description'];
594
+            echo str_repeat("&nbsp;&gt;",$level);
595
+
596
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
597
+            if ($icon != 'nolink')
598
+            {
599
+                if ($completed=='completed') {
600
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
601
+                }	else {
602
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
603
+                    //echo "&nbsp;";
604
+                }
605
+            }
606
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
607
+
608
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
609
+
610
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
611
+            if ($icon == 'icon') { echo "<img src='../img/jqz.gif' align=\"absmiddle\" alt='hot potatoes'>"; }
612
+
613
+            $cid = $_course['official_code'];
614
+
615
+            if ($builder != 'builder')
616
+            {
617
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
618
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
619
+                if ($desc != '')
620
+                {
621
+                    if ($icon != 'wrap')
622
+                    {
623
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
624
+                    }
625
+                    else
626
+                    {
627
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
628
+                    }
629
+                }
630
+            }
631
+            else
632
+            {
633
+                echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
634
+            }
635
+            break;
636
+
637
+        case "Forum":
638
+            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
639
+            $result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
640
+            $myrow=Database::fetch_array($result);
641
+
642
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
643
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
644
+            if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
645
+            $desc=$row['description'];
646
+            echo str_repeat("&nbsp;&gt;",$level);
647
+
648
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
649
+            if ($icon != 'nolink')
650
+            {
651
+                if ($completed=='completed') {
652
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
653
+                }	else {
654
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
655
+                    //echo "&nbsp;";
656
+                }
657
+            }
658
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
659
+
660
+            if ($myrow["forum_name"]=='') { $type="Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
661
+
662
+            if ($icon == 'nolink') { return(shorten($myrow["forum_name"],$length)); }
663
+            if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
664
+            $forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
665
+            if ($builder != 'builder')
666
+            {
667
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
668
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
669
+                if ($desc != '')
670
+                {
671
+                    if ($icon != 'wrap')
672
+                    {
673
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
674
+                    }
675
+                    else
676
+                    {
677
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
678
+                    }
679
+                }
680
+            }
681
+            else
682
+            {
683
+                echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
684
+            }
685
+            break;
686
+
687
+        case "Thread":  //forum post
688 688
         //deprecated
689
-			$tbl_topics      = $_course['dbNameGlu'].'bb_topics';
690
-			$tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
691
-			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
692
-			$sql="SELECT * FROM $tbl_topics where topic_id=$id";
693
-			$result= Database::query($sql);
694
-			$myrow=Database::fetch_array($result);
695
-
696
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
697
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
698
-			if ($row['title'] != '') { $myrow["topic_title"]=$row['title']; }
699
-			$desc=$row['description'];
700
-			echo str_repeat("&nbsp;&gt;",$level);
701
-
702
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
703
-			if ($icon != 'nolink')
704
-			{
705
-				if ($completed=='completed') {
706
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
707
-				}	else {
708
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
709
-					//echo "&nbsp;";
710
-				}
711
-			}
712
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
713
-
714
-			if ($myrow["topic_title"]=='') { $type="Forum Post"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
715
-
716
-			if ($icon == 'nolink') { return(shorten($myrow["topic_title"],$length)); }
717
-			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
718
-			if ($builder != 'builder')
719
-			{
720
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
721
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
722
-				if ($desc != '')
723
-				{
724
-					if ($icon != 'wrap')
725
-					{
726
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
727
-					}
728
-					else
729
-					{
730
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
731
-					}
732
-				}
733
-			}
734
-			else
735
-			{
736
-				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
737
-			}
738
-			break;
739
-
740
-		case "Post":
689
+            $tbl_topics      = $_course['dbNameGlu'].'bb_topics';
690
+            $tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
691
+            $TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
692
+            $sql="SELECT * FROM $tbl_topics where topic_id=$id";
693
+            $result= Database::query($sql);
694
+            $myrow=Database::fetch_array($result);
695
+
696
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
697
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
698
+            if ($row['title'] != '') { $myrow["topic_title"]=$row['title']; }
699
+            $desc=$row['description'];
700
+            echo str_repeat("&nbsp;&gt;",$level);
701
+
702
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
703
+            if ($icon != 'nolink')
704
+            {
705
+                if ($completed=='completed') {
706
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
707
+                }	else {
708
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
709
+                    //echo "&nbsp;";
710
+                }
711
+            }
712
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
713
+
714
+            if ($myrow["topic_title"]=='') { $type="Forum Post"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
715
+
716
+            if ($icon == 'nolink') { return(shorten($myrow["topic_title"],$length)); }
717
+            if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
718
+            if ($builder != 'builder')
719
+            {
720
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
721
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
722
+                if ($desc != '')
723
+                {
724
+                    if ($icon != 'wrap')
725
+                    {
726
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
727
+                    }
728
+                    else
729
+                    {
730
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
731
+                    }
732
+                }
733
+            }
734
+            else
735
+            {
736
+                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
737
+            }
738
+            break;
739
+
740
+        case "Post":
741 741
         //deprecated
742
-			$tbl_posts       = $_course['dbNameGlu'].'bb_posts';
743
-			$tbl_posts_text  = $_course['dbNameGlu'].'bb_posts_text';
744
-			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
745
-			$result= Database::query("SELECT * FROM $tbl_posts where post_id=$id");
746
-			$myrow=Database::fetch_array($result);
747
-			// grabbing the title of the post
748
-			$sql_titel="SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
749
-			$result_titel=Database::query($sql_titel);
750
-			$myrow_titel=Database::fetch_array($result_titel);
751
-
752
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
753
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
754
-			if ($row['title'] != '') { $myrow_titel["post_title"]=$row['title']; }
755
-			$desc=$row['description'];
756
-			echo str_repeat("&nbsp;&gt;",$level);
757
-
758
-			$posternom=$myrow['nom'];				$posterprenom=$myrow['prenom'];
759
-			$posttime=$myrow['post_time'];			$posttext=$myrow_titel['post_text'];
760
-			$posttitle=$myrow_titel['post_title'];
761
-			$posttext = str_replace('"',"'",$posttext);
762
-
763
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
764
-			if ($icon != 'nolink')
765
-			{
766
-				if ($completed=='completed') {
767
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
768
-				}	else {
769
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
770
-					//echo "&nbsp;";
771
-				}
772
-			}
773
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
774
-
775
-			if ($myrow_titel["post_title"]=='')
776
-			{
777
-				$type="Forum";
778
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
779
-			}
780
-
781
-			if ($icon == 'nolink') { return(shorten($myrow_titel["post_title"],$length)); }
782
-			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
783
-			if ($builder != 'builder')
784
-			{
785
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
786
-				if ($desc != '')
787
-				{
788
-					if ($icon != 'wrap')
789
-					{
790
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
791
-					}
792
-					else
793
-					{
794
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
795
-					}
796
-				}
797
-			}
798
-			else
799
-			{
800
-				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>";
801
-			}
802
-			break;
803
-
804
-		case "Document":
805
-			$dbTable  = Database::get_course_table(TABLE_DOCUMENT);
806
-			$result=Database::query("SELECT * FROM $dbTable WHERE id=$id");
807
-			$myrow=Database::fetch_array($result);
808
-
809
-			$pathname=explode("/",$myrow["path"]); // making a correct name for the link
810
-			$last=count($pathname)-1;  // making a correct name for the link
811
-			$filename=$pathname[$last];  // making a correct name for the link
812
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
813
-
814
-			echo str_repeat("&nbsp;&gt;",$level);
815
-
816
-			if ($icon != 'nolink') {
817
-				if ($completed=='completed') {
818
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
819
-				}	else {
820
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
821
-					//echo "&nbsp;";
822
-				}
823
-			}
824
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
825
-			$image=choose_image($filename);
826
-
827
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
828
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
829
-			if ($row['title'] != '') { $filename=$row['title']; }
830
-			$desc=$row['description'];
831
-
832
-			if (($myrow["path"]=='') and ($filename=='')) {
833
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
834
-				return(true);
835
-			}
836
-
837
-			if ($icon == 'nolink') { return(shorten($filename,$length)); }
838
-			if ($icon == 'icon') { echo "<img src='../img/$image' align=\"absmiddle\" alt='$image'>"; }
839
-			if ($builder != 'builder')
840
-			{
841
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename,($length-3*$level))."</a>";
842
-				if ($desc != '')
843
-				{
844
-					if ($icon != 'wrap')
845
-					{
846
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
847
-					}
848
-					else
849
-					{
850
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
851
-					}
852
-				} $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
853
-			}
854
-			else
855
-			{
856
-				$enableDocumentParsing='yes';
857
-				if (!$enableDocumentParsing)
858
-				{ //this is the solution for the non-parsing version in the builder
859
-					$file=urlencode($myrow["path"]);
860
-					echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
861
-				}
862
-				else
863
-				{
864
-					echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
865
-				}
866
-			}
867
-			break;
868
-
869
-		case "Assignments":
870
-			$name=get_lang('Assignments');
871
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
872
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
873
-			if ($row['title'] != '') { $name=$row['title']; }
874
-			$desc=$row['description'];
875
-			echo str_repeat("&nbsp;&gt;",$level);
876
-
877
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
878
-			if ($icon != 'nolink')
879
-			{
880
-				if ($completed=='completed') {
881
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
882
-				}	else {
883
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
884
-					//echo "&nbsp;";
885
-				}
886
-			}
887
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
888
-
889
-			if ($name=='')
890
-			{
891
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
892
-			}
893
-
894
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
895
-			if ($icon == 'icon') { echo "<img src='../img/works.gif' align=\"absmiddle\">"; }
896
-			if ($builder != 'builder')
897
-			{
898
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
899
-				if ($desc != '')
900
-				{
901
-					if ($icon != 'wrap')
902
-					{
903
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
904
-					}
905
-					else
906
-					{
907
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
908
-					}
909
-				}
910
-			}
911
-			else
912
-			{
913
-				echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
914
-			}
915
-			break;
916
-		case "Dropbox":
917
-			$name=get_lang('Dropbox');
918
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
919
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
920
-			if ($row['title'] != '') { $name=$row['title']; }
921
-			$desc=$row['description'];
922
-			echo str_repeat("&nbsp;&gt;",$level);
923
-
924
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
925
-			if ($icon != 'nolink') {
926
-				if ($completed=='completed') {
927
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
928
-				}	else {
929
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
930
-					//echo "&nbsp;";
931
-				}
932
-			}
933
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
934
-
935
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
936
-
937
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
938
-			if ($icon == 'icon') { echo "<img src='../img/dropbox.gif' align=\"absmiddle\">"; }
939
-
940
-			if ($builder != 'builder')
941
-			{
942
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
943
-				if ($desc != '') {
944
-					if ($icon != 'wrap') {
945
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
946
-					else {
947
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
948
-				}
949
-			} else {
950
-				echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
951
-			}
952
-			break;
953
-		case "Introduction_text":
954
-			$name=get_lang('IntroductionText');
955
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
956
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
957
-			if ($row['title'] != '') { $name=$row['title']; }
958
-			$desc=$row['description'];
959
-			echo str_repeat("&nbsp;&gt;",$level);
960
-
961
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
962
-			if ($icon != 'nolink') {
963
-				if ($completed=='completed') {
964
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
965
-				}	else {
966
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
967
-					//echo "&nbsp;";
968
-				}
969
-			}
970
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
971
-
972
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
973
-
974
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
975
-			if ($icon == 'icon') { echo "<img src='../img/introduction.gif' align=\"absmiddle\" alt='introduction'>"; }
976
-
977
-			if ($builder != 'builder')
978
-			{
979
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
980
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
981
-				if ($desc != '') {
982
-					if ($icon != 'wrap') {
983
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
984
-					else {
985
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
986
-				}
987
-			} else {
988
-				$s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
989
-				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
990
-			}
991
-			break;
992
-		case "Course_description":
993
-			$name=get_lang('CourseDescription');
994
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
995
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
996
-			if ($row['title'] != '') { $name=$row['title']; }
997
-			$desc=$row['description'];
998
-			echo str_repeat("&nbsp;&gt;",$level);
999
-
1000
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
1001
-			if ($icon != 'nolink') {
1002
-				if ($completed=='completed') {
1003
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1004
-				}	else {
1005
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1006
-					//echo "&nbsp;";
1007
-				}
1008
-			}
1009
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
1010
-
1011
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1012
-
1013
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
1014
-			if ($icon == 'icon') { echo "<img src='../img/info.gif' align=\"absmiddle\" alt='info'>"; }
1015
-
1016
-			if ($builder != 'builder')
1017
-			{
1018
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
1019
-				if ($desc != '') {
1020
-					if ($icon != 'wrap') {
1021
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1022
-					else {
1023
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1024
-				}
1025
-			} else {
1026
-				$s=api_get_path(WEB_CODE_PATH)."course_description";
1027
-				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
1028
-			}
1029
-			break;
1030
-		case "Groups":
1031
-			$name=get_lang('Groups');
1032
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1033
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1034
-			if ($row['title'] != '') { $name=$row['title']; }
1035
-			$desc=$row['description'];
1036
-			echo str_repeat("&nbsp;&gt;",$level);
1037
-
1038
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
1039
-			if ($icon != 'nolink') {
1040
-				if ($completed=='completed') {
1041
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1042
-				}	else {
1043
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1044
-					//echo "&nbsp;";
1045
-				}
1046
-			}
1047
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
1048
-
1049
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1050
-
1051
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
1052
-			if ($icon == 'icon') { echo "<img src='../img/group.gif' align=\"absmiddle\" alt='group'>"; }
1053
-
1054
-			if ($builder != 'builder')
1055
-			{
1056
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
1057
-				if ($desc != '') {
1058
-					if ($icon != 'wrap') {
1059
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1060
-					else {
1061
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1062
-				}
1063
-			} else {
1064
-				echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
1065
-			}
1066
-			break;
1067
-		case "Users":
1068
-			$name=get_lang('Users');
1069
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1070
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1071
-			if ($row['title'] != '') { $name=$row['title']; }
1072
-			$desc=$row['description'];
1073
-			echo str_repeat("&nbsp;&gt;",$level);
1074
-
1075
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
1076
-			if ($icon != 'nolink') {
1077
-				if ($completed=='completed') {
1078
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1079
-				}	else {
1080
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1081
-					//echo "&nbsp;";
1082
-				}
1083
-			}
1084
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
1085
-
1086
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1087
-
1088
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
1089
-			if ($icon == 'icon') { echo "<img src='../img/members.gif' align=\"absmiddle\" alt='members'>"; }
1090
-
1091
-			if ($builder != 'builder')
1092
-			{
1093
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1094
-				if ($desc != '') {
1095
-					if ($icon != 'wrap') {
1096
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1097
-					else {
1098
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1099
-				}
1100
-			} else {
1101
-				echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
1102
-			}
1103
-			break;
1104
-	}//end huge switch-statement
742
+            $tbl_posts       = $_course['dbNameGlu'].'bb_posts';
743
+            $tbl_posts_text  = $_course['dbNameGlu'].'bb_posts_text';
744
+            $TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
745
+            $result= Database::query("SELECT * FROM $tbl_posts where post_id=$id");
746
+            $myrow=Database::fetch_array($result);
747
+            // grabbing the title of the post
748
+            $sql_titel="SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
749
+            $result_titel=Database::query($sql_titel);
750
+            $myrow_titel=Database::fetch_array($result_titel);
751
+
752
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
753
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
754
+            if ($row['title'] != '') { $myrow_titel["post_title"]=$row['title']; }
755
+            $desc=$row['description'];
756
+            echo str_repeat("&nbsp;&gt;",$level);
757
+
758
+            $posternom=$myrow['nom'];				$posterprenom=$myrow['prenom'];
759
+            $posttime=$myrow['post_time'];			$posttext=$myrow_titel['post_text'];
760
+            $posttitle=$myrow_titel['post_title'];
761
+            $posttext = str_replace('"',"'",$posttext);
762
+
763
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
764
+            if ($icon != 'nolink')
765
+            {
766
+                if ($completed=='completed') {
767
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
768
+                }	else {
769
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
770
+                    //echo "&nbsp;";
771
+                }
772
+            }
773
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
774
+
775
+            if ($myrow_titel["post_title"]=='')
776
+            {
777
+                $type="Forum";
778
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
779
+            }
780
+
781
+            if ($icon == 'nolink') { return(shorten($myrow_titel["post_title"],$length)); }
782
+            if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
783
+            if ($builder != 'builder')
784
+            {
785
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
786
+                if ($desc != '')
787
+                {
788
+                    if ($icon != 'wrap')
789
+                    {
790
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
791
+                    }
792
+                    else
793
+                    {
794
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
795
+                    }
796
+                }
797
+            }
798
+            else
799
+            {
800
+                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>";
801
+            }
802
+            break;
803
+
804
+        case "Document":
805
+            $dbTable  = Database::get_course_table(TABLE_DOCUMENT);
806
+            $result=Database::query("SELECT * FROM $dbTable WHERE id=$id");
807
+            $myrow=Database::fetch_array($result);
808
+
809
+            $pathname=explode("/",$myrow["path"]); // making a correct name for the link
810
+            $last=count($pathname)-1;  // making a correct name for the link
811
+            $filename=$pathname[$last];  // making a correct name for the link
812
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
813
+
814
+            echo str_repeat("&nbsp;&gt;",$level);
815
+
816
+            if ($icon != 'nolink') {
817
+                if ($completed=='completed') {
818
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
819
+                }	else {
820
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
821
+                    //echo "&nbsp;";
822
+                }
823
+            }
824
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
825
+            $image=choose_image($filename);
826
+
827
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
828
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
829
+            if ($row['title'] != '') { $filename=$row['title']; }
830
+            $desc=$row['description'];
831
+
832
+            if (($myrow["path"]=='') and ($filename=='')) {
833
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
834
+                return(true);
835
+            }
836
+
837
+            if ($icon == 'nolink') { return(shorten($filename,$length)); }
838
+            if ($icon == 'icon') { echo "<img src='../img/$image' align=\"absmiddle\" alt='$image'>"; }
839
+            if ($builder != 'builder')
840
+            {
841
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename,($length-3*$level))."</a>";
842
+                if ($desc != '')
843
+                {
844
+                    if ($icon != 'wrap')
845
+                    {
846
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
847
+                    }
848
+                    else
849
+                    {
850
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
851
+                    }
852
+                } $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
853
+            }
854
+            else
855
+            {
856
+                $enableDocumentParsing='yes';
857
+                if (!$enableDocumentParsing)
858
+                { //this is the solution for the non-parsing version in the builder
859
+                    $file=urlencode($myrow["path"]);
860
+                    echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
861
+                }
862
+                else
863
+                {
864
+                    echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
865
+                }
866
+            }
867
+            break;
868
+
869
+        case "Assignments":
870
+            $name=get_lang('Assignments');
871
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
872
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
873
+            if ($row['title'] != '') { $name=$row['title']; }
874
+            $desc=$row['description'];
875
+            echo str_repeat("&nbsp;&gt;",$level);
876
+
877
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
878
+            if ($icon != 'nolink')
879
+            {
880
+                if ($completed=='completed') {
881
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
882
+                }	else {
883
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
884
+                    //echo "&nbsp;";
885
+                }
886
+            }
887
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
888
+
889
+            if ($name=='')
890
+            {
891
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
892
+            }
893
+
894
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
895
+            if ($icon == 'icon') { echo "<img src='../img/works.gif' align=\"absmiddle\">"; }
896
+            if ($builder != 'builder')
897
+            {
898
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
899
+                if ($desc != '')
900
+                {
901
+                    if ($icon != 'wrap')
902
+                    {
903
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
904
+                    }
905
+                    else
906
+                    {
907
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
908
+                    }
909
+                }
910
+            }
911
+            else
912
+            {
913
+                echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
914
+            }
915
+            break;
916
+        case "Dropbox":
917
+            $name=get_lang('Dropbox');
918
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
919
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
920
+            if ($row['title'] != '') { $name=$row['title']; }
921
+            $desc=$row['description'];
922
+            echo str_repeat("&nbsp;&gt;",$level);
923
+
924
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
925
+            if ($icon != 'nolink') {
926
+                if ($completed=='completed') {
927
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
928
+                }	else {
929
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
930
+                    //echo "&nbsp;";
931
+                }
932
+            }
933
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
934
+
935
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
936
+
937
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
938
+            if ($icon == 'icon') { echo "<img src='../img/dropbox.gif' align=\"absmiddle\">"; }
939
+
940
+            if ($builder != 'builder')
941
+            {
942
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
943
+                if ($desc != '') {
944
+                    if ($icon != 'wrap') {
945
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
946
+                    else {
947
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
948
+                }
949
+            } else {
950
+                echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
951
+            }
952
+            break;
953
+        case "Introduction_text":
954
+            $name=get_lang('IntroductionText');
955
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
956
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
957
+            if ($row['title'] != '') { $name=$row['title']; }
958
+            $desc=$row['description'];
959
+            echo str_repeat("&nbsp;&gt;",$level);
960
+
961
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
962
+            if ($icon != 'nolink') {
963
+                if ($completed=='completed') {
964
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
965
+                }	else {
966
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
967
+                    //echo "&nbsp;";
968
+                }
969
+            }
970
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
971
+
972
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
973
+
974
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
975
+            if ($icon == 'icon') { echo "<img src='../img/introduction.gif' align=\"absmiddle\" alt='introduction'>"; }
976
+
977
+            if ($builder != 'builder')
978
+            {
979
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
980
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
981
+                if ($desc != '') {
982
+                    if ($icon != 'wrap') {
983
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
984
+                    else {
985
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
986
+                }
987
+            } else {
988
+                $s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
989
+                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
990
+            }
991
+            break;
992
+        case "Course_description":
993
+            $name=get_lang('CourseDescription');
994
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
995
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
996
+            if ($row['title'] != '') { $name=$row['title']; }
997
+            $desc=$row['description'];
998
+            echo str_repeat("&nbsp;&gt;",$level);
999
+
1000
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
1001
+            if ($icon != 'nolink') {
1002
+                if ($completed=='completed') {
1003
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1004
+                }	else {
1005
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1006
+                    //echo "&nbsp;";
1007
+                }
1008
+            }
1009
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
1010
+
1011
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1012
+
1013
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
1014
+            if ($icon == 'icon') { echo "<img src='../img/info.gif' align=\"absmiddle\" alt='info'>"; }
1015
+
1016
+            if ($builder != 'builder')
1017
+            {
1018
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
1019
+                if ($desc != '') {
1020
+                    if ($icon != 'wrap') {
1021
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1022
+                    else {
1023
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1024
+                }
1025
+            } else {
1026
+                $s=api_get_path(WEB_CODE_PATH)."course_description";
1027
+                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
1028
+            }
1029
+            break;
1030
+        case "Groups":
1031
+            $name=get_lang('Groups');
1032
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
1033
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
1034
+            if ($row['title'] != '') { $name=$row['title']; }
1035
+            $desc=$row['description'];
1036
+            echo str_repeat("&nbsp;&gt;",$level);
1037
+
1038
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
1039
+            if ($icon != 'nolink') {
1040
+                if ($completed=='completed') {
1041
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1042
+                }	else {
1043
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1044
+                    //echo "&nbsp;";
1045
+                }
1046
+            }
1047
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
1048
+
1049
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1050
+
1051
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
1052
+            if ($icon == 'icon') { echo "<img src='../img/group.gif' align=\"absmiddle\" alt='group'>"; }
1053
+
1054
+            if ($builder != 'builder')
1055
+            {
1056
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
1057
+                if ($desc != '') {
1058
+                    if ($icon != 'wrap') {
1059
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1060
+                    else {
1061
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1062
+                }
1063
+            } else {
1064
+                echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
1065
+            }
1066
+            break;
1067
+        case "Users":
1068
+            $name=get_lang('Users');
1069
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
1070
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
1071
+            if ($row['title'] != '') { $name=$row['title']; }
1072
+            $desc=$row['description'];
1073
+            echo str_repeat("&nbsp;&gt;",$level);
1074
+
1075
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
1076
+            if ($icon != 'nolink') {
1077
+                if ($completed=='completed') {
1078
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1079
+                }	else {
1080
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1081
+                    //echo "&nbsp;";
1082
+                }
1083
+            }
1084
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
1085
+
1086
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1087
+
1088
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
1089
+            if ($icon == 'icon') { echo "<img src='../img/members.gif' align=\"absmiddle\" alt='members'>"; }
1090
+
1091
+            if ($builder != 'builder')
1092
+            {
1093
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1094
+                if ($desc != '') {
1095
+                    if ($icon != 'wrap') {
1096
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1097
+                    else {
1098
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1099
+                }
1100
+            } else {
1101
+                echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
1102
+            }
1103
+            break;
1104
+    }//end huge switch-statement
1105 1105
 }
1106 1106
 
1107 1107
 /**
@@ -1116,253 +1116,253 @@  discard block
 block discarded – undo
1116 1116
 */
1117 1117
 function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
1118 1118
 {
1119
-	global $_course, $learnpath_id, $tbl_learnpath_item, $items;
1120
-	global $curDirPath, $_configuration, $enableDocumentParsing, $_user , $_cid;
1121
-
1122
-	$hyperlink_target_parameter = ""; //or e.g. target='_blank'
1123
- $builder = 'player';
1124
-	$origin='learnpath';
1125
-
1126
-	$linktype=$type;
1127
-	if (($type=="Link _self") or ($type=="Link _blank")) { $type="Link"; }
1128
-
1129
- $link = '';
1130
-
1131
-	switch ($type)
1132
-	{
1133
-		case "Agenda":
1134
-			$TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);;
1135
-			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
1136
-			$myrow=Database::fetch_array($result);
1137
-
1138
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1139
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1140
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
1141
-			$desc=$row['description'];
1142
-			$agenda_id=$row['item_id'];
1143
-
1144
-			if ($builder != 'builder')
1145
-			{
1146
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
1147
-			}
1148
-			else
1149
-			{
1150
-				$link .= "../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id";
1151
-			}
1152
-			break;
1153
-
1154
-		case "Ad_Valvas":
1155
-			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
1156
-			$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
1157
-			$myrow=Database::fetch_array($result);
1158
-
1159
-			if ($builder != 'builder')
1160
-			{
1161
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$id#$id_in_path";
1162
-			}
1163
-			else
1164
-			{
1165
-				$link .= "../announcements/announcements.php?origin=$origin&ann_id=$id";
1166
-			}
1167
-			break;
1168
-
1169
-		case "Link" :
1170
-			$TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
1171
-			$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
1172
-			$myrow=Database::fetch_array($result);
1173
-
1174
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1175
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1176
-
1177
-			$thelink=$myrow["url"];
1178
-			if ($builder != 'builder')
1179
-			{
1180
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
1181
-			}
1182
-			else
1183
-			{
1184
-				$link .= $thelink;
1185
-			}
1186
-			break;
1187
-
1188
-		case "Exercise":
1189
-			$TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
1190
-			$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
1191
-			$myrow=Database::fetch_array($result);
1192
-
1193
-			if ($builder=='builder') { $origin='builder'; }
1194
-			  //this is needed for the exercise_submit.php can delete the session info about tests
1195
-
1196
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1197
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1198
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
1199
-
1200
-			if ($builder != 'builder')
1201
-			{
1202
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
1203
-			}
1204
-			else
1205
-			{
1206
-				$link .= "../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"];
1207
-			}
1208
-			break;
1209
-
1210
-		case "HotPotatoes":
1211
-	  	    $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
1212
-		    $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
1213
-			$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
1214
-		    $myrow= Database::fetch_array($result);
1215
-		    $path=$myrow["path"];
1216
-		  	$name=GetQuizName($path,$documentPath);
1217
-
1218
-			if ($builder=='builder') { $origin='builder'; }
1219
-
1220
-			$cid = $_course['official_code'];
1221
-
1222
-			if ($builder != 'builder')
1223
-			{
1224
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
1225
-			}
1226
-			else
1227
-			{
1228
-				$link .= "../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."";
1229
-			}
1230
-			break;
1231
-
1232
-		case "Forum":
1119
+    global $_course, $learnpath_id, $tbl_learnpath_item, $items;
1120
+    global $curDirPath, $_configuration, $enableDocumentParsing, $_user , $_cid;
1121
+
1122
+    $hyperlink_target_parameter = ""; //or e.g. target='_blank'
1123
+    $builder = 'player';
1124
+    $origin='learnpath';
1125
+
1126
+    $linktype=$type;
1127
+    if (($type=="Link _self") or ($type=="Link _blank")) { $type="Link"; }
1128
+
1129
+    $link = '';
1130
+
1131
+    switch ($type)
1132
+    {
1133
+        case "Agenda":
1134
+            $TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);;
1135
+            $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
1136
+            $myrow=Database::fetch_array($result);
1137
+
1138
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
1139
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
1140
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
1141
+            $desc=$row['description'];
1142
+            $agenda_id=$row['item_id'];
1143
+
1144
+            if ($builder != 'builder')
1145
+            {
1146
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
1147
+            }
1148
+            else
1149
+            {
1150
+                $link .= "../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id";
1151
+            }
1152
+            break;
1153
+
1154
+        case "Ad_Valvas":
1155
+            $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
1156
+            $result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
1157
+            $myrow=Database::fetch_array($result);
1158
+
1159
+            if ($builder != 'builder')
1160
+            {
1161
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$id#$id_in_path";
1162
+            }
1163
+            else
1164
+            {
1165
+                $link .= "../announcements/announcements.php?origin=$origin&ann_id=$id";
1166
+            }
1167
+            break;
1168
+
1169
+        case "Link" :
1170
+            $TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
1171
+            $result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
1172
+            $myrow=Database::fetch_array($result);
1173
+
1174
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
1175
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
1176
+
1177
+            $thelink=$myrow["url"];
1178
+            if ($builder != 'builder')
1179
+            {
1180
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
1181
+            }
1182
+            else
1183
+            {
1184
+                $link .= $thelink;
1185
+            }
1186
+            break;
1187
+
1188
+        case "Exercise":
1189
+            $TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
1190
+            $result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
1191
+            $myrow=Database::fetch_array($result);
1192
+
1193
+            if ($builder=='builder') { $origin='builder'; }
1194
+                //this is needed for the exercise_submit.php can delete the session info about tests
1195
+
1196
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
1197
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
1198
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
1199
+
1200
+            if ($builder != 'builder')
1201
+            {
1202
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
1203
+            }
1204
+            else
1205
+            {
1206
+                $link .= "../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"];
1207
+            }
1208
+            break;
1209
+
1210
+        case "HotPotatoes":
1211
+              $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
1212
+            $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
1213
+            $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
1214
+            $myrow= Database::fetch_array($result);
1215
+            $path=$myrow["path"];
1216
+                $name=GetQuizName($path,$documentPath);
1217
+
1218
+            if ($builder=='builder') { $origin='builder'; }
1219
+
1220
+            $cid = $_course['official_code'];
1221
+
1222
+            if ($builder != 'builder')
1223
+            {
1224
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
1225
+            }
1226
+            else
1227
+            {
1228
+                $link .= "../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."";
1229
+            }
1230
+            break;
1231
+
1232
+        case "Forum":
1233 1233
         //deprecated
1234
-			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
1235
-			$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
1236
-			$myrow=Database::fetch_array($result);
1237
-
1238
-			if ($builder=='builder') { $origin='builder'; }
1239
-
1240
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1241
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1242
-			if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
1243
-
1244
-			if ($myrow["forum_name"]=='') { $type="Forum"; }
1245
-
1246
-			$forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
1247
-			if ($builder != 'builder')
1248
-			{
1249
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
1250
-			}
1251
-			else
1252
-			{
1253
-				$link .= "../phpbb/viewforum.php?$forumparameters";
1254
-			}
1255
-			break;
1256
-
1257
-		case "Thread":  //forum post
1234
+            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
1235
+            $result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
1236
+            $myrow=Database::fetch_array($result);
1237
+
1238
+            if ($builder=='builder') { $origin='builder'; }
1239
+
1240
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
1241
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
1242
+            if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
1243
+
1244
+            if ($myrow["forum_name"]=='') { $type="Forum"; }
1245
+
1246
+            $forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
1247
+            if ($builder != 'builder')
1248
+            {
1249
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
1250
+            }
1251
+            else
1252
+            {
1253
+                $link .= "../phpbb/viewforum.php?$forumparameters";
1254
+            }
1255
+            break;
1256
+
1257
+        case "Thread":  //forum post
1258 1258
         //deprecated
1259
-			$tbl_topics      = $_course['dbNameGlu'].'bb_topics';
1260
-			$tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
1261
-			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
1262
-			$sql="SELECT * FROM $tbl_topics where topic_id=$id";
1263
-			$result= Database::query($sql);
1264
-			$myrow=Database::fetch_array($result);
1265
-
1266
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1267
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1268
-
1269
-			if ($builder != 'builder')
1270
-			{
1271
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
1272
-			}
1273
-			else
1274
-			{
1275
-				$link .= "../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
1276
-			}
1277
-			break;
1278
-		case "Post":
1279
-			break;
1280
-		case "Document":
1281
-			$dbTable  = Database::get_course_table(TABLE_DOCUMENT);
1282
-			$result=Database::query("SELECT * FROM $dbTable WHERE id=$id",__FILE__,__LINE);
1283
-			$myrow=Database::fetch_array($result);
1284
-
1285
-			$pathname=explode("/",$myrow["path"]); // making a correct name for the link
1286
-			$last=count($pathname)-1;  // making a correct name for the link
1287
-			$filename=$pathname[$last];  // making a correct name for the link
1288
-
1289
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1290
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1291
-
1292
-			if ($builder != 'builder')
1293
-			{
1294
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
1295
-
1296
-			}
1297
-			else
1298
-			{
1299
-				$enableDocumentParsing='yes';
1300
-				if (!$enableDocumentParsing)
1301
-				{ //this is the solution for the non-parsing version in the builder
1302
-					$file=urlencode($myrow["path"]);
1303
-					$link .= "../document/showinframes.php?file=$file";
1304
-				}
1305
-				else
1306
-				{
1307
-					$link .= "../document/download.php?doc_url=".$myrow["path"];
1308
-				}
1309
-			}
1310
-			break;
1311
-
1312
-		case "Assignments":
1313
-			if ($builder != 'builder')
1314
-			{
1315
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
1316
-			}
1317
-			else
1318
-			{
1319
-				$link .= "../work/work.php";
1320
-			}
1321
-			break;
1322
-		case "Dropbox":
1323
-			if ($builder != 'builder')
1324
-			{
1325
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
1326
-			} else {
1327
-				$link .= "../dropbox/index.php";
1328
-			}
1329
-			break;
1330
-		case "Introduction_text":
1331
-			if ($builder != 'builder')
1332
-			{
1333
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
1334
-			} else {
1335
-				$s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
1336
-				$link .= $s;
1337
-			}
1338
-			break;
1339
-		case "Course_description":
1340
-			if ($builder != 'builder')
1341
-			{
1342
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
1343
-			} else {
1344
-				$s=api_get_path(WEB_CODE_PATH)."course_description";
1345
-				$link .= $s;
1346
-			}
1347
-			break;
1348
-		case "Groups":
1349
-
1350
-			if ($builder != 'builder')
1351
-			{
1352
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
1353
-			} else {
1354
-				$link .= "../group/group.php?origin=$origin";
1355
-			}
1356
-			break;
1357
-		case "Users":
1358
-			if ($builder != 'builder')
1359
-			{
1360
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1361
-			} else {
1362
-				$link .= "../user/user.php?origin=$origin";
1363
-			}
1364
-			break;
1365
-	}//end huge switch-statement
1259
+            $tbl_topics      = $_course['dbNameGlu'].'bb_topics';
1260
+            $tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
1261
+            $TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
1262
+            $sql="SELECT * FROM $tbl_topics where topic_id=$id";
1263
+            $result= Database::query($sql);
1264
+            $myrow=Database::fetch_array($result);
1265
+
1266
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
1267
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
1268
+
1269
+            if ($builder != 'builder')
1270
+            {
1271
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
1272
+            }
1273
+            else
1274
+            {
1275
+                $link .= "../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
1276
+            }
1277
+            break;
1278
+        case "Post":
1279
+            break;
1280
+        case "Document":
1281
+            $dbTable  = Database::get_course_table(TABLE_DOCUMENT);
1282
+            $result=Database::query("SELECT * FROM $dbTable WHERE id=$id",__FILE__,__LINE);
1283
+            $myrow=Database::fetch_array($result);
1284
+
1285
+            $pathname=explode("/",$myrow["path"]); // making a correct name for the link
1286
+            $last=count($pathname)-1;  // making a correct name for the link
1287
+            $filename=$pathname[$last];  // making a correct name for the link
1288
+
1289
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
1290
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
1291
+
1292
+            if ($builder != 'builder')
1293
+            {
1294
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
1295
+
1296
+            }
1297
+            else
1298
+            {
1299
+                $enableDocumentParsing='yes';
1300
+                if (!$enableDocumentParsing)
1301
+                { //this is the solution for the non-parsing version in the builder
1302
+                    $file=urlencode($myrow["path"]);
1303
+                    $link .= "../document/showinframes.php?file=$file";
1304
+                }
1305
+                else
1306
+                {
1307
+                    $link .= "../document/download.php?doc_url=".$myrow["path"];
1308
+                }
1309
+            }
1310
+            break;
1311
+
1312
+        case "Assignments":
1313
+            if ($builder != 'builder')
1314
+            {
1315
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
1316
+            }
1317
+            else
1318
+            {
1319
+                $link .= "../work/work.php";
1320
+            }
1321
+            break;
1322
+        case "Dropbox":
1323
+            if ($builder != 'builder')
1324
+            {
1325
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
1326
+            } else {
1327
+                $link .= "../dropbox/index.php";
1328
+            }
1329
+            break;
1330
+        case "Introduction_text":
1331
+            if ($builder != 'builder')
1332
+            {
1333
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
1334
+            } else {
1335
+                $s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
1336
+                $link .= $s;
1337
+            }
1338
+            break;
1339
+        case "Course_description":
1340
+            if ($builder != 'builder')
1341
+            {
1342
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
1343
+            } else {
1344
+                $s=api_get_path(WEB_CODE_PATH)."course_description";
1345
+                $link .= $s;
1346
+            }
1347
+            break;
1348
+        case "Groups":
1349
+
1350
+            if ($builder != 'builder')
1351
+            {
1352
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
1353
+            } else {
1354
+                $link .= "../group/group.php?origin=$origin";
1355
+            }
1356
+            break;
1357
+        case "Users":
1358
+            if ($builder != 'builder')
1359
+            {
1360
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1361
+            } else {
1362
+                $link .= "../user/user.php?origin=$origin";
1363
+            }
1364
+            break;
1365
+    }//end huge switch-statement
1366 1366
     return $link;
1367 1367
 }
1368 1368
 
@@ -1371,12 +1371,12 @@  discard block
 block discarded – undo
1371 1371
 */
1372 1372
 function remove_resource($resource_key)
1373 1373
 {
1374
-	$addedresource = $_SESSION['addedresource'];
1375
-	$addedresourceid = $_SESSION['addedresourceid'];
1376
-	unset($addedresource[$resource_key]);
1377
-	unset($addedresourceid[$resource_key]);
1378
-	$_SESSION['addedresource']=$addedresource;
1379
-	$_SESSION['addedresourceid']=$addedresourceid ;
1374
+    $addedresource = $_SESSION['addedresource'];
1375
+    $addedresourceid = $_SESSION['addedresourceid'];
1376
+    unset($addedresource[$resource_key]);
1377
+    unset($addedresourceid[$resource_key]);
1378
+    $_SESSION['addedresource']=$addedresource;
1379
+    $_SESSION['addedresourceid']=$addedresourceid ;
1380 1380
 }
1381 1381
 
1382 1382
 /**
@@ -1385,8 +1385,8 @@  discard block
 block discarded – undo
1385 1385
 */
1386 1386
 function show_addresource_button($additionalparameters = '')
1387 1387
 {
1388
-	global $charset;
1389
-	echo '<label for="addresources"><img src="../img/attachment.gif" /></label><input class="link_alike" type="submit" name="addresources" id="addresources" value="'.api_htmlentities(get_lang('Attachment'), ENT_QUOTES, $charset).'" '.$additionalparameters.' />';
1388
+    global $charset;
1389
+    echo '<label for="addresources"><img src="../img/attachment.gif" /></label><input class="link_alike" type="submit" name="addresources" id="addresources" value="'.api_htmlentities(get_lang('Attachment'), ENT_QUOTES, $charset).'" '.$additionalparameters.' />';
1390 1390
 }
1391 1391
 
1392 1392
 /**
@@ -1408,11 +1408,11 @@  discard block
 block discarded – undo
1408 1408
 */
1409 1409
 function delete_added_resource($type, $id)
1410 1410
 {
1411
-	global $_course;
1412
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1411
+    global $_course;
1412
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1413 1413
 
1414
-	$sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1415
-	Database::query($sql);
1414
+    $sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1415
+    Database::query($sql);
1416 1416
 }
1417 1417
 
1418 1418
 /**
@@ -1421,12 +1421,12 @@  discard block
 block discarded – undo
1421 1421
 */
1422 1422
 function delete_all_resources_type($type)
1423 1423
 {
1424
-  global $_course;
1425
-  $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1424
+    global $_course;
1425
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1426 1426
 
1427
-  $sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type'";
1427
+    $sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type'";
1428 1428
 
1429
-  Database::query($sql);
1429
+    Database::query($sql);
1430 1430
 }
1431 1431
 
1432 1432
 /**
@@ -1434,15 +1434,15 @@  discard block
 block discarded – undo
1434 1434
 */
1435 1435
 function check_added_resources($type, $id)
1436 1436
 {
1437
-	global $_course, $origin;
1438
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1439
-	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1440
-	$result=Database::query($sql);
1441
-	$number_added=Database::num_rows($result);
1442
-	if ($number_added<>0)
1443
-		return true;
1444
-	else
1445
-		return false;
1437
+    global $_course, $origin;
1438
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1439
+    $sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1440
+    $result=Database::query($sql);
1441
+    $number_added=Database::num_rows($result);
1442
+    if ($number_added<>0)
1443
+        return true;
1444
+    else
1445
+        return false;
1446 1446
 }
1447 1447
 
1448 1448
 
@@ -1452,18 +1452,18 @@  discard block
 block discarded – undo
1452 1452
 */
1453 1453
 function edit_added_resources($type, $id)
1454 1454
 {
1455
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1455
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1456 1456
     $course_id = api_get_course_int_id();
1457 1457
     $id = intval($id);
1458 1458
     $type = Database::escape_string($type);
1459
-	$sql="SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
1460
-	$result=Database::query($sql);
1461
-	while ($row=Database::fetch_array($result))	{
1462
-		$addedresource[]=$row["resource_type"];
1463
-		$addedresourceid[]=$row["resource_id"];
1464
-	}
1465
-	$_SESSION['addedresource']=$addedresource;
1466
-	$_SESSION['addedresourceid']=$addedresourceid;
1459
+    $sql="SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
1460
+    $result=Database::query($sql);
1461
+    while ($row=Database::fetch_array($result))	{
1462
+        $addedresource[]=$row["resource_type"];
1463
+        $addedresourceid[]=$row["resource_id"];
1464
+    }
1465
+    $_SESSION['addedresource']=$addedresource;
1466
+    $_SESSION['addedresourceid']=$addedresourceid;
1467 1467
 }
1468 1468
 
1469 1469
 /**
@@ -1473,20 +1473,20 @@  discard block
 block discarded – undo
1473 1473
 */
1474 1474
 function update_added_resources($type, $id)
1475 1475
 {
1476
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1476
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1477 1477
     $course_id = api_get_course_int_id();
1478 1478
     $id = intval($id);
1479 1479
     $type = Database::escape_string($type);
1480
-	// delete all the added resources for this item in the database;
1481
-	$sql="DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' AND source_id='$id'";
1482
-	//echo $sql;
1483
-	Database::query($sql);
1480
+    // delete all the added resources for this item in the database;
1481
+    $sql="DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' AND source_id='$id'";
1482
+    //echo $sql;
1483
+    Database::query($sql);
1484 1484
 
1485
-	// store the resources from the session into the database
1486
-	store_resources($type, $id);
1485
+    // store the resources from the session into the database
1486
+    store_resources($type, $id);
1487 1487
 
1488
-	//delete_added_resource_($type, $id);
1489
-	unset_session_resources();
1488
+    //delete_added_resource_($type, $id);
1489
+    unset_session_resources();
1490 1490
 }
1491 1491
 
1492 1492
 /**
@@ -1494,25 +1494,25 @@  discard block
 block discarded – undo
1494 1494
 */
1495 1495
 function display_added_resources($type, $id, $style='')
1496 1496
 {
1497
-	// the array containing the icons
1498
-	$arr_icons=array('Agenda'=>'../img/agenda.gif', 'Ad Valvas'=>'../img/valves.gif', 'Link'=>'../img/links.gif', 'Exercise'=>'../img/quiz.gif' );
1499
-
1500
-	global $_course, $origin;
1501
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1502
-
1503
-	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1504
-	$result=Database::query($sql);
1505
-	while ($row=Database::fetch_array($result))
1506
-	{
1507
-		if ($origin != 'learnpath')
1508
-		{
1509
-			display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
1510
-		}
1511
-		else
1512
-		{
1513
-			display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
1514
-		}
1515
-	}
1497
+    // the array containing the icons
1498
+    $arr_icons=array('Agenda'=>'../img/agenda.gif', 'Ad Valvas'=>'../img/valves.gif', 'Link'=>'../img/links.gif', 'Exercise'=>'../img/quiz.gif' );
1499
+
1500
+    global $_course, $origin;
1501
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1502
+
1503
+    $sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1504
+    $result=Database::query($sql);
1505
+    while ($row=Database::fetch_array($result))
1506
+    {
1507
+        if ($origin != 'learnpath')
1508
+        {
1509
+            display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
1510
+        }
1511
+        else
1512
+        {
1513
+            display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
1514
+        }
1515
+    }
1516 1516
 }
1517 1517
 
1518 1518
 
@@ -1523,15 +1523,15 @@  discard block
 block discarded – undo
1523 1523
 */
1524 1524
 function display_resources($showdeleteimg)
1525 1525
 {
1526
-	global $action;
1527
-	global $resourceaction;
1528
-	global $id;
1529
-	global $locationkey;
1530
-	global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
1531
-
1532
-	if ($resourceaction=="removeresource")
1533
-	{
1534
-		/* unneccessary because when editing we delete all the added resources from the
1526
+    global $action;
1527
+    global $resourceaction;
1528
+    global $id;
1529
+    global $locationkey;
1530
+    global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
1531
+
1532
+    if ($resourceaction=="removeresource")
1533
+    {
1534
+        /* unneccessary because when editing we delete all the added resources from the
1535 1535
 		database and add all these from the session
1536 1536
 		if ($action=="edit") // we have an edit and thus we delete from the database and from the session
1537 1537
 		{
@@ -1547,41 +1547,41 @@  discard block
 block discarded – undo
1547 1547
 		}
1548 1548
 		else // we remove from the session
1549 1549
 		{*/
1550
-		//echo "remove from session";
1551
-		remove_resource($locationkey);
1552
-	}
1553
-	$addedresource=$_SESSION['addedresource'];
1554
-	$addedresourceid=$_SESSION['addedresourceid'];
1555
-	if (is_array($addedresource))
1556
-	{
1557
-		echo '<table>';
1558
-		foreach ($addedresource as $resource)
1559
-		{
1560
-			//echo $resource.":".$addedresourceid[key($addedresource)];
1561
-			echo '<tr><td>';
1562
-			display_addedresource_link($resource,$addedresourceid[key($addedresource)]);
1563
-			echo '</td><td width="30">';
1564
-
1565
-			// if $_SERVER['REQUEST_URI'] contains and ?id=xx we have an edit and the url for deleting a session added resource
1566
-			// should also contain this id.
1567
-			$test=parse_url($_SERVER['REQUEST_URI']);
1568
-			$output = array();
1569
-			parse_str($test['query'],$output);
1570
-
1571
-			if ($showdeleteimg==1)
1572
-			{
1573
-				echo "<a href=".api_get_self()."?showresources=true&amp;source_forum=".$_GET['source_forum']."&amp;resourceaction=removeresource&amp;locationkey=".key($addedresource)."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no><img src='../img/delete.gif' border='0' alt='resource ".get_lang('Delete')."' /></a><br />";
1574
-			}
1575
-			echo '</td></tr>';
1576
-			next($addedresource);
1577
-			//$_SESSION['edit']=='';
1578
-		}
1579
-		echo '</table>';
1580
-	}
1581
-	else // it is a string
1582
-	{
1583
-		echo '';
1584
-	}
1550
+        //echo "remove from session";
1551
+        remove_resource($locationkey);
1552
+    }
1553
+    $addedresource=$_SESSION['addedresource'];
1554
+    $addedresourceid=$_SESSION['addedresourceid'];
1555
+    if (is_array($addedresource))
1556
+    {
1557
+        echo '<table>';
1558
+        foreach ($addedresource as $resource)
1559
+        {
1560
+            //echo $resource.":".$addedresourceid[key($addedresource)];
1561
+            echo '<tr><td>';
1562
+            display_addedresource_link($resource,$addedresourceid[key($addedresource)]);
1563
+            echo '</td><td width="30">';
1564
+
1565
+            // if $_SERVER['REQUEST_URI'] contains and ?id=xx we have an edit and the url for deleting a session added resource
1566
+            // should also contain this id.
1567
+            $test=parse_url($_SERVER['REQUEST_URI']);
1568
+            $output = array();
1569
+            parse_str($test['query'],$output);
1570
+
1571
+            if ($showdeleteimg==1)
1572
+            {
1573
+                echo "<a href=".api_get_self()."?showresources=true&amp;source_forum=".$_GET['source_forum']."&amp;resourceaction=removeresource&amp;locationkey=".key($addedresource)."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no><img src='../img/delete.gif' border='0' alt='resource ".get_lang('Delete')."' /></a><br />";
1574
+            }
1575
+            echo '</td></tr>';
1576
+            next($addedresource);
1577
+            //$_SESSION['edit']=='';
1578
+        }
1579
+        echo '</table>';
1580
+    }
1581
+    else // it is a string
1582
+    {
1583
+        echo '';
1584
+    }
1585 1585
 } // end of the display_resources function
1586 1586
 
1587 1587
 
@@ -1593,49 +1593,49 @@  discard block
 block discarded – undo
1593 1593
 */
1594 1594
 function showorhide_addresourcelink($type, $id)
1595 1595
 {
1596
-	global $from_learnpath, $source_id, $action, $learnpath_id, $chapter_id, $originalresource, $folder, $content, $target;
1597
-	//global $_SESSION['addresource'];
1598
-	//global $_SESSION['addresourceid'];
1599
-	$addedresource=$_SESSION['addedresource'];
1600
-	$addedresourceid=$_SESSION['addedresourceid'];
1601
-
1602
-	if (is_array($_SESSION['addedresource']))
1603
-	{
1604
-		foreach ($addedresource as $toolcompare)
1605
-		{
1606
-			//echo $toolcompare;
1607
-			//echo "/".$type."/".$id."****";
1608
-			//$key=key($addedresource);
1609
-			//echo $addedresourceid[$key];
1610
-			//print_r($addedresourceid);
1611
-			//echo "<br>";
1612
-
1613
-			if ($toolcompare==$type and $addedresourceid[key($addedresource)]==$id)
1614
-			{
1615
-				$show=0;
1616
-			}
1617
-			next($addedresource);
1618
-		}
1619
-		if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
1620
-		if ($show!==0)
1621
-		{
1622
-			if ($type=="Document")
1623
-			{
1624
-				echo "<a href=".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".$lang_add_it_or_resource."</a>";
1625
-			}
1626
-			else
1627
-			{
1628
-				echo "<a href='".api_get_self()."?content=".$type."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
1629
-			}
1630
-		}
1631
-	}
1632
-	else // if it is not an array, it is a string
1633
-	{
1634
-		if ($_SESSION['addedresource']!==$type or $_SESSION['addedresourceid']!==$id)
1635
-		{
1636
-			if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
1637
-			echo "<a href='".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
1638
-		}
1639
-	}
1596
+    global $from_learnpath, $source_id, $action, $learnpath_id, $chapter_id, $originalresource, $folder, $content, $target;
1597
+    //global $_SESSION['addresource'];
1598
+    //global $_SESSION['addresourceid'];
1599
+    $addedresource=$_SESSION['addedresource'];
1600
+    $addedresourceid=$_SESSION['addedresourceid'];
1601
+
1602
+    if (is_array($_SESSION['addedresource']))
1603
+    {
1604
+        foreach ($addedresource as $toolcompare)
1605
+        {
1606
+            //echo $toolcompare;
1607
+            //echo "/".$type."/".$id."****";
1608
+            //$key=key($addedresource);
1609
+            //echo $addedresourceid[$key];
1610
+            //print_r($addedresourceid);
1611
+            //echo "<br>";
1612
+
1613
+            if ($toolcompare==$type and $addedresourceid[key($addedresource)]==$id)
1614
+            {
1615
+                $show=0;
1616
+            }
1617
+            next($addedresource);
1618
+        }
1619
+        if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
1620
+        if ($show!==0)
1621
+        {
1622
+            if ($type=="Document")
1623
+            {
1624
+                echo "<a href=".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".$lang_add_it_or_resource."</a>";
1625
+            }
1626
+            else
1627
+            {
1628
+                echo "<a href='".api_get_self()."?content=".$type."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
1629
+            }
1630
+        }
1631
+    }
1632
+    else // if it is not an array, it is a string
1633
+    {
1634
+        if ($_SESSION['addedresource']!==$type or $_SESSION['addedresourceid']!==$id)
1635
+        {
1636
+            if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
1637
+            echo "<a href='".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
1638
+        }
1639
+    }
1640 1640
 }
1641 1641
 ?>
Please login to merge, or discard this patch.
Spacing   +409 added lines, -409 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
 */
25 25
 
26 26
 function unset_session_resources() {
27
-	$_SESSION['addedresource']='';
28
-	$_SESSION['addedresourceid']='';
27
+	$_SESSION['addedresource'] = '';
28
+	$_SESSION['addedresourceid'] = '';
29 29
 	Session::erase('addedresource');
30 30
 	Session::erase('addedresourceid');
31 31
 }
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 	}
47 47
 	if ($level and $level != 0 and $level != 1)
48 48
 	{
49
-		$folder_up=$folder;
50
-		$folder_temp=explode('/',$folder);
51
-		$last=count($folder_temp)-1;
49
+		$folder_up = $folder;
50
+		$folder_temp = explode('/', $folder);
51
+		$last = count($folder_temp) - 1;
52 52
 		unset($folder_temp[$last]);
53
-		$folder_up=implode('/',$folder_temp);
53
+		$folder_up = implode('/', $folder_temp);
54 54
 		echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;folder=$folder_up&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
55 55
 	}
56 56
 }
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
 	// other tools do not have this feature. This only counts
69 69
 	if (api_is_allowed_to_edit())
70 70
 	{
71
-		$visibility="ip.visibility<>'2'";
71
+		$visibility = "ip.visibility<>'2'";
72 72
 	}
73 73
 	else
74 74
 	{
75
-		$visibility="ip.visibility='1'";
75
+		$visibility = "ip.visibility='1'";
76 76
 	}
77 77
 
78 78
 	$item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
 			    (ip.to_group_id = 0 OR i.to_group_id IS NULL) AND
86 86
 			    ip.to_user_id IS NULL
87 87
 			ORDER BY docs.path ASC";
88
-	$result=Database::query($sql);
89
-	while ($row=Database::fetch_array($result))
88
+	$result = Database::query($sql);
89
+	while ($row = Database::fetch_array($result))
90 90
 	{
91 91
 		if (!$folder)
92 92
 		{
93
-			if (get_levels($row['path'])-1==1)
93
+			if (get_levels($row['path']) - 1 == 1)
94 94
 			{
95 95
 				// showing the right icon
96 96
 				if (file_or_folder($row['path']))
@@ -107,12 +107,12 @@  discard block
 block discarded – undo
107 107
 				if (file_or_folder($row['path']))
108 108
 				{
109 109
 					echo "<a href='".api_get_self()."?content=Document";
110
-					echo "&amp;folder=".substr($row['path'],1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'],1).'</a><br />';
110
+					echo "&amp;folder=".substr($row['path'], 1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'], 1).'</a><br />';
111 111
 				}
112 112
 				else
113 113
 				{
114
-					echo substr($row['path'],1).' ';
115
-					echo showorhide_addresourcelink('Document',$row['id']);
114
+					echo substr($row['path'], 1).' ';
115
+					echo showorhide_addresourcelink('Document', $row['id']);
116 116
 					echo '<br />';
117 117
 				}
118 118
 			}
@@ -121,16 +121,16 @@  discard block
 block discarded – undo
121 121
 		{
122 122
 			// we calculate the level we are in by using the $folder in the url
123 123
 			// we put +1 because it does not start with an / and in the database it does
124
-			$level=get_levels($folder)+1;
124
+			$level = get_levels($folder) + 1;
125 125
 
126 126
 			// we calculate each level of the database entry
127
-			$file_level=get_levels($row['path'])-1;
127
+			$file_level = get_levels($row['path']) - 1;
128 128
 			// if the level of the database entry is equal to the level we ar in, we put it into an array
129 129
 			// as this is a potential good entry
130
-			if ($file_level==$level)
130
+			if ($file_level == $level)
131 131
 			{
132
-				$good_paths[]=$row['path'];
133
-				$good_ids[]=$row['id'];
132
+				$good_paths[] = $row['path'];
133
+				$good_ids[] = $row['id'];
134 134
 			}
135 135
 			//$haystack=$row['path'];
136 136
 			//$conform_folder=strstr($haystack, $folder);
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
 		// we have all the potential good database entries, the good ones are those that start with $folder
150 150
 		foreach ($good_paths as $path)
151 151
 		{
152
-			if (strstr($path,$folder))
152
+			if (strstr($path, $folder))
153 153
 			{
154
-				$good_key=key($good_paths);
154
+				$good_key = key($good_paths);
155 155
 				// showing the right icon
156 156
 				if (file_or_folder($path))
157 157
 				{
@@ -166,17 +166,17 @@  discard block
 block discarded – undo
166 166
 				// folders should be clickable
167 167
 				if (file_or_folder($path))
168 168
 				{
169
-					$path=substr($path,1); // remove the first / in folder_up
170
-					$uri=str_replace($folder,$path,$_SERVER['REQUEST_URI']);
171
-					$newuri=str_replace('add=','addnot=',$uri);
169
+					$path = substr($path, 1); // remove the first / in folder_up
170
+					$uri = str_replace($folder, $path, $_SERVER['REQUEST_URI']);
171
+					$newuri = str_replace('add=', 'addnot=', $uri);
172 172
 					//using the correct name of the folder
173
-					$folder_name=str_replace($folder.'/','',$path);
173
+					$folder_name = str_replace($folder.'/', '', $path);
174 174
 					echo "<a href='$newuri'>".$folder_name.'</a><br />';
175 175
 				}
176 176
 				else
177 177
 				{
178
-					echo str_replace("/$folder/", '',$path).' ';
179
-					echo showorhide_addresourcelink('Document',$good_ids[$good_key]);
178
+					echo str_replace("/$folder/", '', $path).' ';
179
+					echo showorhide_addresourcelink('Document', $good_ids[$good_key]);
180 180
 					echo '<br />';
181 181
 				}
182 182
 			}
@@ -219,13 +219,13 @@  discard block
 block discarded – undo
219 219
 	{
220 220
 		foreach ($addedresource as $resource_type)
221 221
 		{
222
-			$sql="INSERT INTO $resource_table (source_type, source_id, resource_type, resource_id) VALUES ('$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
222
+			$sql = "INSERT INTO $resource_table (source_type, source_id, resource_type, resource_id) VALUES ('$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
223 223
 			Database::query($sql);
224
-			$i=key($addedresource);
224
+			$i = key($addedresource);
225 225
 			next($addedresource);
226 226
 		}
227
-		$_SESSION['addedresource']='';
228
-		$_SESSION['addedresourceid']='';
227
+		$_SESSION['addedresource'] = '';
228
+		$_SESSION['addedresourceid'] = '';
229 229
 	}
230 230
 }
231 231
 
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
  * @param $style this is used to style the link (for instance when a resource is hidden => the added resources should also be styled like they are hidden)
239 239
  * @todo use the constants for the type definitions.
240 240
  */
241
-function display_addedresource_link($type, $id, $style='')
241
+function display_addedresource_link($type, $id, $style = '')
242 242
 {
243 243
 	global $_course;
244 244
 
@@ -283,9 +283,9 @@  discard block
 block discarded – undo
283 283
 			break;
284 284
 		case 'Thread':  //=topics
285 285
         //deprecated
286
-			$tbl_posts		= $_course['dbNameGlu'].'bb_posts';
287
-			$tbl_posts_text	= $_course['dbNameGlu'].'bb_posts_text';
288
-			$TBL_FORUMS		= $_course['dbNameGlu'].'bb_forums';
286
+			$tbl_posts = $_course['dbNameGlu'].'bb_posts';
287
+			$tbl_posts_text = $_course['dbNameGlu'].'bb_posts_text';
288
+			$TBL_FORUMS = $_course['dbNameGlu'].'bb_forums';
289 289
 			$result = Database::query("SELECT * FROM $tbl_posts posts, $TBL_FORUMS forum WHERE forum.forum_id=posts.forum_id and post_id=$id");
290 290
 			$myrow = Database::fetch_array($result);
291 291
 			// grabbing the title of the post
@@ -307,14 +307,14 @@  discard block
 block discarded – undo
307 307
 			$dbTable = Database::get_course_table(TABLE_DOCUMENT);
308 308
 			$result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
309 309
 			$myrow = Database::fetch_array($result);
310
-			$pathname = explode('/',$myrow['path']); // making a correct name for the link
311
-			$last = count($pathname) - 1;  // making a correct name for the link
312
-			$filename = $pathname[$last];  // making a correct name for the link
310
+			$pathname = explode('/', $myrow['path']); // making a correct name for the link
311
+			$last = count($pathname) - 1; // making a correct name for the link
312
+			$filename = $pathname[$last]; // making a correct name for the link
313 313
 			$image = choose_image($filename);
314
-			$ext = explode('.',$filename);
315
-			$ext = strtolower($ext[sizeof($ext)-1]);
314
+			$ext = explode('.', $filename);
315
+			$ext = strtolower($ext[sizeof($ext) - 1]);
316 316
 			$myrow['path'] = rawurlencode($myrow['path']);
317
-			$in_frames = in_array($ext, array('htm','html','gif','jpg','jpeg','png'));
317
+			$in_frames = in_array($ext, array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png'));
318 318
 			echo '<img src="../img/'.$image.'" align="middle" /> <a href="../document/'.($in_frames ? 'showinframes.php?file=' : 'download.php?doc_url=').$myrow['path'].'"'.$styling.'>'.$filename."</a><br />\n";
319 319
 			break;
320 320
 		case 'Externallink':
@@ -349,391 +349,391 @@  discard block
 block discarded – undo
349 349
 
350 350
 	$length = ((($builder == 'builder') and ($icon == 'nolink')) ? 65 : 32);
351 351
 
352
-	if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
352
+	if ($builder != 'builder') $origin = 'learnpath'; //origin = learnpath in student view
353 353
 	$linktype = $type;
354 354
 	if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
355 355
 
356 356
 	switch ($type)
357 357
 	{
358 358
 		case "Agenda":
359
-			$TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);
359
+			$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
360 360
 			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
361
-			$myrow=Database::fetch_array($result);
362
-
363
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
364
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
365
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
366
-			$desc=$row['description'];
367
-			$agenda_id=$row['item_id'];
368
-			echo str_repeat("&nbsp;&gt;",$level);
361
+			$myrow = Database::fetch_array($result);
362
+
363
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
364
+			$result = Database::query($sql); $row = Database::fetch_array($result);
365
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
366
+			$desc = $row['description'];
367
+			$agenda_id = $row['item_id'];
368
+			echo str_repeat("&nbsp;&gt;", $level);
369 369
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
370 370
 			if ($icon != 'nolink')
371 371
 			{
372
-				if ($completed=='completed') {
372
+				if ($completed == 'completed') {
373 373
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
374
-				}	else {
374
+				} else {
375 375
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
376 376
 					//echo "&nbsp;";
377 377
 				}
378 378
 			}
379 379
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
380 380
 
381
-			if ($myrow["title"]=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
381
+			if ($myrow["title"] == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
382 382
 
383
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
383
+			if ($icon == 'nolink') { return(shorten($myrow["title"], $length)); }
384 384
 			if ($icon == 'icon') { echo "<img src='../img/agenda.gif' align=\"absmiddle\" alt='agenda'>"; }
385 385
 			if ($builder != 'builder')
386 386
 			{
387
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
388
-        		$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
387
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
388
+        		$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
389 389
 				if ($desc != '')
390 390
 				{
391 391
 					if ($icon != 'wrap')
392 392
 					{
393
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
393
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
394 394
 					}
395 395
 					else
396 396
 					{
397
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
397
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
398 398
 					}
399 399
 				}
400 400
 			}
401 401
 			else
402 402
 			{
403
-				echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
403
+				echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
404 404
 			}
405 405
 			break;
406 406
 
407 407
 		case "Ad_Valvas":
408 408
 			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
409 409
 			$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
410
-			$myrow=Database::fetch_array($result);
410
+			$myrow = Database::fetch_array($result);
411 411
 
412
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
413
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
414
-			if ($row['title'] != '') { $myrow["content"]=$row['title']; }
415
-			$desc=$row['description'];
416
-			$ann_id=$row['item_id'];
417
-			echo str_repeat("&nbsp;&gt;",$level);
412
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
413
+			$result = Database::query($sql); $row = Database::fetch_array($result);
414
+			if ($row['title'] != '') { $myrow["content"] = $row['title']; }
415
+			$desc = $row['description'];
416
+			$ann_id = $row['item_id'];
417
+			echo str_repeat("&nbsp;&gt;", $level);
418 418
 
419 419
 			// the title and the text are in the content field and we only want to display the title
420
-			list($title, $text)=split('<br>',$myrow['content']);
421
-			if ($title=='') { $title=$myrow['content']; }
422
-			$title=$myrow['title'];
423
-			$text=$myrow['content'];
420
+			list($title, $text) = split('<br>', $myrow['content']);
421
+			if ($title == '') { $title = $myrow['content']; }
422
+			$title = $myrow['title'];
423
+			$text = $myrow['content'];
424 424
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
425 425
 			if ($icon != 'nolink')
426 426
 			{
427
-				if ($completed=='completed') {
427
+				if ($completed == 'completed') {
428 428
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
429
-				}	else {
429
+				} else {
430 430
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
431 431
 					//echo "&nbsp;";
432 432
 				}
433 433
 			}
434 434
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
435 435
 
436
-			if ($title=='') {
437
-				$type="Announcement";
436
+			if ($title == '') {
437
+				$type = "Announcement";
438 438
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
439 439
 				return(true);
440 440
 			}
441 441
 
442
-			if ($icon == 'nolink') { return(shorten($title,$length)); }
442
+			if ($icon == 'nolink') { return(shorten($title, $length)); }
443 443
 			if ($icon == 'icon') { echo "<img src='../img/valves.gif' align=\"absmiddle\" alt='ad valvas'>"; }
444 444
 			if ($builder != 'builder')
445 445
 			{
446
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title,($length-3*$level))."</a>";
447
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
446
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title, ($length - 3 * $level))."</a>";
447
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
448 448
 				if ($desc != '')
449 449
 				{
450 450
 					if ($icon != 'wrap')
451 451
 					{
452
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
452
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
453 453
 					}
454 454
 					else
455 455
 					{
456
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
456
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
457 457
 					}
458 458
 				}
459 459
 			}
460 460
 			else
461 461
 			{
462
-				echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title,($length-3*$level))."</a>";
462
+				echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title, ($length - 3 * $level))."</a>";
463 463
 			}
464 464
 			break;
465 465
 
466 466
 		case "Link" :
467
-			$TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
468
-			$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
469
-			$myrow=Database::fetch_array($result);
467
+			$TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
468
+			$result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
469
+			$myrow = Database::fetch_array($result);
470 470
 
471
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
472
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
473
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
474
-			$desc=$row['description'];
475
-			echo str_repeat("&nbsp;&gt;",$level);
471
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
472
+			$result = Database::query($sql); $row = Database::fetch_array($result);
473
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
474
+			$desc = $row['description'];
475
+			echo str_repeat("&nbsp;&gt;", $level);
476 476
 
477 477
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
478 478
 			if ($icon != 'nolink')
479 479
 			{
480
-				if ($completed=='completed') {
480
+				if ($completed == 'completed') {
481 481
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
482
-				}	else {
482
+				} else {
483 483
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
484 484
 					//echo "&nbsp;";
485 485
 				}
486 486
 			}
487 487
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
488 488
 
489
-			if ($myrow["title"]=='')
489
+			if ($myrow["title"] == '')
490 490
 			{
491 491
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
492 492
 				return(true);
493 493
 			}
494 494
 
495
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
495
+			if ($icon == 'nolink') { return(shorten($myrow["title"], $length)); }
496 496
 			if ($icon == 'icon')
497 497
 			{
498
-				if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
498
+				if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
499 499
 				   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
500 500
 			}
501
-			$thelink=$myrow["url"];
501
+			$thelink = $myrow["url"];
502 502
 			if ($builder != 'builder')
503 503
 			{
504
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
505
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
504
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
505
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
506 506
 				if ($desc != '')
507 507
 				{
508 508
 					if ($icon != 'wrap')
509 509
 					{
510
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
510
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
511 511
 					}
512 512
 					else
513 513
 					{
514
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
514
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
515 515
 					}
516 516
 				}
517 517
 			}
518 518
 			else
519 519
 			{
520
-				echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
520
+				echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
521 521
 			}
522 522
 			break;
523 523
 
524 524
 		case "Exercise":
525
-			$TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
526
-			$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
527
-			$myrow=Database::fetch_array($result);
525
+			$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
526
+			$result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
527
+			$myrow = Database::fetch_array($result);
528 528
 
529
-			if ($builder=='builder') { $origin='builder'; }
529
+			if ($builder == 'builder') { $origin = 'builder'; }
530 530
 			  //this is needed for the exercise_submit.php can delete the session info about tests
531 531
 
532
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
533
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
534
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
535
-			$desc=$row['description'];
536
-			echo str_repeat("&nbsp;&gt;",$level);
532
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
533
+			$result = Database::query($sql); $row = Database::fetch_array($result);
534
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
535
+			$desc = $row['description'];
536
+			echo str_repeat("&nbsp;&gt;", $level);
537 537
 
538 538
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
539 539
 			if ($icon != 'nolink')
540 540
 			{
541
-				if ($completed=='completed') {
541
+				if ($completed == 'completed') {
542 542
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
543
-				}	else {
543
+				} else {
544 544
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
545 545
 					//echo "&nbsp;";
546 546
 				}
547 547
 			}
548 548
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
549 549
 
550
-			if ($myrow["title"]=='') {
550
+			if ($myrow["title"] == '') {
551 551
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
552 552
 				return(true);
553 553
 			}
554 554
 
555
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
555
+			if ($icon == 'nolink') { return(shorten($myrow["title"], $length)); }
556 556
 			if ($icon == 'icon') { echo "<img src='../img/quiz.gif' align=\"absmiddle\" alt='quizz'>"; }
557 557
 			if ($builder != 'builder')
558 558
 			{
559
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
560
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
559
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
560
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
561 561
 				if ($desc != '')
562 562
 				{
563 563
 					if ($icon != 'wrap')
564 564
 					{
565
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
565
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
566 566
 					}
567 567
 					else
568 568
 					{
569
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
569
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
570 570
 					}
571 571
 				}
572 572
 			}
573 573
 			else
574 574
 			{
575
-				echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
575
+				echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
576 576
 			}
577 577
 			break;
578 578
 
579 579
 		case "HotPotatoes":
580
-			$TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
581
-			$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
580
+			$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
581
+			$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
582 582
 			$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
583
-			$myrow= Database::fetch_array($result);
584
-			$path=$myrow["path"];
585
-			$name=GetQuizName($path,$documentPath);
583
+			$myrow = Database::fetch_array($result);
584
+			$path = $myrow["path"];
585
+			$name = GetQuizName($path, $documentPath);
586 586
 
587
-			if ($builder=='builder') { $origin='builder'; }
587
+			if ($builder == 'builder') { $origin = 'builder'; }
588 588
 			  //this is needed for the exercise_submit.php can delete the session info about tests
589 589
 
590
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
591
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
592
-			if ($row['title'] != '') { $name=$row['title']; }
593
-			$desc=$row['description'];
594
-			echo str_repeat("&nbsp;&gt;",$level);
590
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
591
+			$result = Database::query($sql); $row = Database::fetch_array($result);
592
+			if ($row['title'] != '') { $name = $row['title']; }
593
+			$desc = $row['description'];
594
+			echo str_repeat("&nbsp;&gt;", $level);
595 595
 
596 596
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
597 597
 			if ($icon != 'nolink')
598 598
 			{
599
-				if ($completed=='completed') {
599
+				if ($completed == 'completed') {
600 600
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
601
-				}	else {
601
+				} else {
602 602
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
603 603
 					//echo "&nbsp;";
604 604
 				}
605 605
 			}
606 606
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
607 607
 
608
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
608
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
609 609
 
610
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
610
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
611 611
 			if ($icon == 'icon') { echo "<img src='../img/jqz.gif' align=\"absmiddle\" alt='hot potatoes'>"; }
612 612
 
613 613
 			$cid = $_course['official_code'];
614 614
 
615 615
 			if ($builder != 'builder')
616 616
 			{
617
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
618
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
617
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>";
618
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
619 619
 				if ($desc != '')
620 620
 				{
621 621
 					if ($icon != 'wrap')
622 622
 					{
623
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
623
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
624 624
 					}
625 625
 					else
626 626
 					{
627
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
627
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
628 628
 					}
629 629
 				}
630 630
 			}
631 631
 			else
632 632
 			{
633
-				echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
633
+				echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
634 634
 			}
635 635
 			break;
636 636
 
637 637
 		case "Forum":
638 638
 			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
639
-			$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
640
-			$myrow=Database::fetch_array($result);
639
+			$result = Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
640
+			$myrow = Database::fetch_array($result);
641 641
 
642
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
643
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
644
-			if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
645
-			$desc=$row['description'];
646
-			echo str_repeat("&nbsp;&gt;",$level);
642
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
643
+			$result = Database::query($sql); $row = Database::fetch_array($result);
644
+			if ($row['title'] != '') { $myrow["forum_name"] = $row['title']; }
645
+			$desc = $row['description'];
646
+			echo str_repeat("&nbsp;&gt;", $level);
647 647
 
648 648
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
649 649
 			if ($icon != 'nolink')
650 650
 			{
651
-				if ($completed=='completed') {
651
+				if ($completed == 'completed') {
652 652
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
653
-				}	else {
653
+				} else {
654 654
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
655 655
 					//echo "&nbsp;";
656 656
 				}
657 657
 			}
658 658
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
659 659
 
660
-			if ($myrow["forum_name"]=='') { $type="Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
660
+			if ($myrow["forum_name"] == '') { $type = "Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
661 661
 
662
-			if ($icon == 'nolink') { return(shorten($myrow["forum_name"],$length)); }
662
+			if ($icon == 'nolink') { return(shorten($myrow["forum_name"], $length)); }
663 663
 			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
664
-			$forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
664
+			$forumparameters = "forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
665 665
 			if ($builder != 'builder')
666 666
 			{
667
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
668
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
667
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"], ($length - 3 * $level))."</a>";
668
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
669 669
 				if ($desc != '')
670 670
 				{
671 671
 					if ($icon != 'wrap')
672 672
 					{
673
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
673
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
674 674
 					}
675 675
 					else
676 676
 					{
677
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
677
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
678 678
 					}
679 679
 				}
680 680
 			}
681 681
 			else
682 682
 			{
683
-				echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
683
+				echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"], ($length - 3 * $level))."</a>";
684 684
 			}
685 685
 			break;
686 686
 
687 687
 		case "Thread":  //forum post
688 688
         //deprecated
689
-			$tbl_topics      = $_course['dbNameGlu'].'bb_topics';
690
-			$tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
689
+			$tbl_topics = $_course['dbNameGlu'].'bb_topics';
690
+			$tbl_posts = $_course['dbNameGlu'].'bb_posts';
691 691
 			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
692
-			$sql="SELECT * FROM $tbl_topics where topic_id=$id";
693
-			$result= Database::query($sql);
694
-			$myrow=Database::fetch_array($result);
692
+			$sql = "SELECT * FROM $tbl_topics where topic_id=$id";
693
+			$result = Database::query($sql);
694
+			$myrow = Database::fetch_array($result);
695 695
 
696
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
697
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
698
-			if ($row['title'] != '') { $myrow["topic_title"]=$row['title']; }
699
-			$desc=$row['description'];
700
-			echo str_repeat("&nbsp;&gt;",$level);
696
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
697
+			$result = Database::query($sql); $row = Database::fetch_array($result);
698
+			if ($row['title'] != '') { $myrow["topic_title"] = $row['title']; }
699
+			$desc = $row['description'];
700
+			echo str_repeat("&nbsp;&gt;", $level);
701 701
 
702 702
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
703 703
 			if ($icon != 'nolink')
704 704
 			{
705
-				if ($completed=='completed') {
705
+				if ($completed == 'completed') {
706 706
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
707
-				}	else {
707
+				} else {
708 708
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
709 709
 					//echo "&nbsp;";
710 710
 				}
711 711
 			}
712 712
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
713 713
 
714
-			if ($myrow["topic_title"]=='') { $type="Forum Post"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
714
+			if ($myrow["topic_title"] == '') { $type = "Forum Post"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
715 715
 
716
-			if ($icon == 'nolink') { return(shorten($myrow["topic_title"],$length)); }
716
+			if ($icon == 'nolink') { return(shorten($myrow["topic_title"], $length)); }
717 717
 			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
718 718
 			if ($builder != 'builder')
719 719
 			{
720
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
721
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
720
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"], ($length - 3 * $level))."</a>";
721
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
722 722
 				if ($desc != '')
723 723
 				{
724 724
 					if ($icon != 'wrap')
725 725
 					{
726
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
726
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
727 727
 					}
728 728
 					else
729 729
 					{
730
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
730
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
731 731
 					}
732 732
 				}
733 733
 			}
734 734
 			else
735 735
 			{
736
-				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
736
+				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"], ($length - 3 * $level))."</a>";
737 737
 			}
738 738
 			break;
739 739
 
@@ -742,363 +742,363 @@  discard block
 block discarded – undo
742 742
 			$tbl_posts       = $_course['dbNameGlu'].'bb_posts';
743 743
 			$tbl_posts_text  = $_course['dbNameGlu'].'bb_posts_text';
744 744
 			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
745
-			$result= Database::query("SELECT * FROM $tbl_posts where post_id=$id");
746
-			$myrow=Database::fetch_array($result);
745
+			$result = Database::query("SELECT * FROM $tbl_posts where post_id=$id");
746
+			$myrow = Database::fetch_array($result);
747 747
 			// grabbing the title of the post
748
-			$sql_titel="SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
749
-			$result_titel=Database::query($sql_titel);
750
-			$myrow_titel=Database::fetch_array($result_titel);
748
+			$sql_titel = "SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
749
+			$result_titel = Database::query($sql_titel);
750
+			$myrow_titel = Database::fetch_array($result_titel);
751 751
 
752
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
753
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
754
-			if ($row['title'] != '') { $myrow_titel["post_title"]=$row['title']; }
755
-			$desc=$row['description'];
756
-			echo str_repeat("&nbsp;&gt;",$level);
752
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
753
+			$result = Database::query($sql); $row = Database::fetch_array($result);
754
+			if ($row['title'] != '') { $myrow_titel["post_title"] = $row['title']; }
755
+			$desc = $row['description'];
756
+			echo str_repeat("&nbsp;&gt;", $level);
757 757
 
758
-			$posternom=$myrow['nom'];				$posterprenom=$myrow['prenom'];
759
-			$posttime=$myrow['post_time'];			$posttext=$myrow_titel['post_text'];
760
-			$posttitle=$myrow_titel['post_title'];
761
-			$posttext = str_replace('"',"'",$posttext);
758
+			$posternom = $myrow['nom']; $posterprenom = $myrow['prenom'];
759
+			$posttime = $myrow['post_time']; $posttext = $myrow_titel['post_text'];
760
+			$posttitle = $myrow_titel['post_title'];
761
+			$posttext = str_replace('"', "'", $posttext);
762 762
 
763 763
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
764 764
 			if ($icon != 'nolink')
765 765
 			{
766
-				if ($completed=='completed') {
766
+				if ($completed == 'completed') {
767 767
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
768
-				}	else {
768
+				} else {
769 769
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
770 770
 					//echo "&nbsp;";
771 771
 				}
772 772
 			}
773 773
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
774 774
 
775
-			if ($myrow_titel["post_title"]=='')
775
+			if ($myrow_titel["post_title"] == '')
776 776
 			{
777
-				$type="Forum";
777
+				$type = "Forum";
778 778
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
779 779
 			}
780 780
 
781
-			if ($icon == 'nolink') { return(shorten($myrow_titel["post_title"],$length)); }
781
+			if ($icon == 'nolink') { return(shorten($myrow_titel["post_title"], $length)); }
782 782
 			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
783 783
 			if ($builder != 'builder')
784 784
 			{
785
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
785
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow_titel["post_title"], ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
786 786
 				if ($desc != '')
787 787
 				{
788 788
 					if ($icon != 'wrap')
789 789
 					{
790
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
790
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
791 791
 					}
792 792
 					else
793 793
 					{
794
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
794
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
795 795
 					}
796 796
 				}
797 797
 			}
798 798
 			else
799 799
 			{
800
-				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>";
800
+				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"], ($length - 3 * $level))."</a>";
801 801
 			}
802 802
 			break;
803 803
 
804 804
 		case "Document":
805
-			$dbTable  = Database::get_course_table(TABLE_DOCUMENT);
806
-			$result=Database::query("SELECT * FROM $dbTable WHERE id=$id");
807
-			$myrow=Database::fetch_array($result);
805
+			$dbTable = Database::get_course_table(TABLE_DOCUMENT);
806
+			$result = Database::query("SELECT * FROM $dbTable WHERE id=$id");
807
+			$myrow = Database::fetch_array($result);
808 808
 
809
-			$pathname=explode("/",$myrow["path"]); // making a correct name for the link
810
-			$last=count($pathname)-1;  // making a correct name for the link
811
-			$filename=$pathname[$last];  // making a correct name for the link
809
+			$pathname = explode("/", $myrow["path"]); // making a correct name for the link
810
+			$last = count($pathname) - 1; // making a correct name for the link
811
+			$filename = $pathname[$last]; // making a correct name for the link
812 812
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
813 813
 
814
-			echo str_repeat("&nbsp;&gt;",$level);
814
+			echo str_repeat("&nbsp;&gt;", $level);
815 815
 
816 816
 			if ($icon != 'nolink') {
817
-				if ($completed=='completed') {
817
+				if ($completed == 'completed') {
818 818
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
819
-				}	else {
819
+				} else {
820 820
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
821 821
 					//echo "&nbsp;";
822 822
 				}
823 823
 			}
824 824
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
825
-			$image=choose_image($filename);
825
+			$image = choose_image($filename);
826 826
 
827
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
828
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
829
-			if ($row['title'] != '') { $filename=$row['title']; }
830
-			$desc=$row['description'];
827
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
828
+			$result = Database::query($sql); $row = Database::fetch_array($result);
829
+			if ($row['title'] != '') { $filename = $row['title']; }
830
+			$desc = $row['description'];
831 831
 
832
-			if (($myrow["path"]=='') and ($filename=='')) {
832
+			if (($myrow["path"] == '') and ($filename == '')) {
833 833
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
834 834
 				return(true);
835 835
 			}
836 836
 
837
-			if ($icon == 'nolink') { return(shorten($filename,$length)); }
837
+			if ($icon == 'nolink') { return(shorten($filename, $length)); }
838 838
 			if ($icon == 'icon') { echo "<img src='../img/$image' align=\"absmiddle\" alt='$image'>"; }
839 839
 			if ($builder != 'builder')
840 840
 			{
841
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename,($length-3*$level))."</a>";
841
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename, ($length - 3 * $level))."</a>";
842 842
 				if ($desc != '')
843 843
 				{
844 844
 					if ($icon != 'wrap')
845 845
 					{
846
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
846
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
847 847
 					}
848 848
 					else
849 849
 					{
850
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
850
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
851 851
 					}
852
-				} $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
852
+				} $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
853 853
 			}
854 854
 			else
855 855
 			{
856
-				$enableDocumentParsing='yes';
856
+				$enableDocumentParsing = 'yes';
857 857
 				if (!$enableDocumentParsing)
858 858
 				{ //this is the solution for the non-parsing version in the builder
859
-					$file=urlencode($myrow["path"]);
860
-					echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
859
+					$file = urlencode($myrow["path"]);
860
+					echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename, ($length - 3 * $level))."</a>";
861 861
 				}
862 862
 				else
863 863
 				{
864
-					echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
864
+					echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename, ($length - 3 * $level))."</a>";
865 865
 				}
866 866
 			}
867 867
 			break;
868 868
 
869 869
 		case "Assignments":
870
-			$name=get_lang('Assignments');
871
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
872
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
873
-			if ($row['title'] != '') { $name=$row['title']; }
874
-			$desc=$row['description'];
875
-			echo str_repeat("&nbsp;&gt;",$level);
870
+			$name = get_lang('Assignments');
871
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
872
+			$result = Database::query($sql); $row = Database::fetch_array($result);
873
+			if ($row['title'] != '') { $name = $row['title']; }
874
+			$desc = $row['description'];
875
+			echo str_repeat("&nbsp;&gt;", $level);
876 876
 
877 877
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
878 878
 			if ($icon != 'nolink')
879 879
 			{
880
-				if ($completed=='completed') {
880
+				if ($completed == 'completed') {
881 881
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
882
-				}	else {
882
+				} else {
883 883
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
884 884
 					//echo "&nbsp;";
885 885
 				}
886 886
 			}
887 887
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
888 888
 
889
-			if ($name=='')
889
+			if ($name == '')
890 890
 			{
891 891
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
892 892
 			}
893 893
 
894
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
894
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
895 895
 			if ($icon == 'icon') { echo "<img src='../img/works.gif' align=\"absmiddle\">"; }
896 896
 			if ($builder != 'builder')
897 897
 			{
898
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
898
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
899 899
 				if ($desc != '')
900 900
 				{
901 901
 					if ($icon != 'wrap')
902 902
 					{
903
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
903
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
904 904
 					}
905 905
 					else
906 906
 					{
907
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
907
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
908 908
 					}
909 909
 				}
910 910
 			}
911 911
 			else
912 912
 			{
913
-				echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
913
+				echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
914 914
 			}
915 915
 			break;
916 916
 		case "Dropbox":
917
-			$name=get_lang('Dropbox');
918
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
919
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
920
-			if ($row['title'] != '') { $name=$row['title']; }
921
-			$desc=$row['description'];
922
-			echo str_repeat("&nbsp;&gt;",$level);
917
+			$name = get_lang('Dropbox');
918
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
919
+			$result = Database::query($sql); $row = Database::fetch_array($result);
920
+			if ($row['title'] != '') { $name = $row['title']; }
921
+			$desc = $row['description'];
922
+			echo str_repeat("&nbsp;&gt;", $level);
923 923
 
924 924
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
925 925
 			if ($icon != 'nolink') {
926
-				if ($completed=='completed') {
926
+				if ($completed == 'completed') {
927 927
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
928
-				}	else {
928
+				} else {
929 929
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
930 930
 					//echo "&nbsp;";
931 931
 				}
932 932
 			}
933 933
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
934 934
 
935
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
935
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
936 936
 
937
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
937
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
938 938
 			if ($icon == 'icon') { echo "<img src='../img/dropbox.gif' align=\"absmiddle\">"; }
939 939
 
940 940
 			if ($builder != 'builder')
941 941
 			{
942
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
942
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
943 943
 				if ($desc != '') {
944 944
 					if ($icon != 'wrap') {
945
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
945
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
946 946
 					else {
947
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
947
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
948 948
 				}
949 949
 			} else {
950
-				echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
950
+				echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
951 951
 			}
952 952
 			break;
953 953
 		case "Introduction_text":
954
-			$name=get_lang('IntroductionText');
955
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
956
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
957
-			if ($row['title'] != '') { $name=$row['title']; }
958
-			$desc=$row['description'];
959
-			echo str_repeat("&nbsp;&gt;",$level);
954
+			$name = get_lang('IntroductionText');
955
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
956
+			$result = Database::query($sql); $row = Database::fetch_array($result);
957
+			if ($row['title'] != '') { $name = $row['title']; }
958
+			$desc = $row['description'];
959
+			echo str_repeat("&nbsp;&gt;", $level);
960 960
 
961 961
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
962 962
 			if ($icon != 'nolink') {
963
-				if ($completed=='completed') {
963
+				if ($completed == 'completed') {
964 964
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
965
-				}	else {
965
+				} else {
966 966
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
967 967
 					//echo "&nbsp;";
968 968
 				}
969 969
 			}
970 970
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
971 971
 
972
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
972
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
973 973
 
974
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
974
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
975 975
 			if ($icon == 'icon') { echo "<img src='../img/introduction.gif' align=\"absmiddle\" alt='introduction'>"; }
976 976
 
977 977
 			if ($builder != 'builder')
978 978
 			{
979
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
980
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
979
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>";
980
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
981 981
 				if ($desc != '') {
982 982
 					if ($icon != 'wrap') {
983
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
983
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
984 984
 					else {
985
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
985
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
986 986
 				}
987 987
 			} else {
988 988
 				$s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
989
-				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
989
+				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
990 990
 			}
991 991
 			break;
992 992
 		case "Course_description":
993
-			$name=get_lang('CourseDescription');
994
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
995
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
996
-			if ($row['title'] != '') { $name=$row['title']; }
997
-			$desc=$row['description'];
998
-			echo str_repeat("&nbsp;&gt;",$level);
993
+			$name = get_lang('CourseDescription');
994
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
995
+			$result = Database::query($sql); $row = Database::fetch_array($result);
996
+			if ($row['title'] != '') { $name = $row['title']; }
997
+			$desc = $row['description'];
998
+			echo str_repeat("&nbsp;&gt;", $level);
999 999
 
1000 1000
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
1001 1001
 			if ($icon != 'nolink') {
1002
-				if ($completed=='completed') {
1002
+				if ($completed == 'completed') {
1003 1003
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1004
-				}	else {
1004
+				} else {
1005 1005
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1006 1006
 					//echo "&nbsp;";
1007 1007
 				}
1008 1008
 			}
1009 1009
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
1010 1010
 
1011
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1011
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1012 1012
 
1013
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
1013
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
1014 1014
 			if ($icon == 'icon') { echo "<img src='../img/info.gif' align=\"absmiddle\" alt='info'>"; }
1015 1015
 
1016 1016
 			if ($builder != 'builder')
1017 1017
 			{
1018
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
1018
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
1019 1019
 				if ($desc != '') {
1020 1020
 					if ($icon != 'wrap') {
1021
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1021
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
1022 1022
 					else {
1023
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1023
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
1024 1024
 				}
1025 1025
 			} else {
1026
-				$s=api_get_path(WEB_CODE_PATH)."course_description";
1027
-				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
1026
+				$s = api_get_path(WEB_CODE_PATH)."course_description";
1027
+				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
1028 1028
 			}
1029 1029
 			break;
1030 1030
 		case "Groups":
1031
-			$name=get_lang('Groups');
1032
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1033
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1034
-			if ($row['title'] != '') { $name=$row['title']; }
1035
-			$desc=$row['description'];
1036
-			echo str_repeat("&nbsp;&gt;",$level);
1031
+			$name = get_lang('Groups');
1032
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
1033
+			$result = Database::query($sql); $row = Database::fetch_array($result);
1034
+			if ($row['title'] != '') { $name = $row['title']; }
1035
+			$desc = $row['description'];
1036
+			echo str_repeat("&nbsp;&gt;", $level);
1037 1037
 
1038 1038
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
1039 1039
 			if ($icon != 'nolink') {
1040
-				if ($completed=='completed') {
1040
+				if ($completed == 'completed') {
1041 1041
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1042
-				}	else {
1042
+				} else {
1043 1043
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1044 1044
 					//echo "&nbsp;";
1045 1045
 				}
1046 1046
 			}
1047 1047
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
1048 1048
 
1049
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1049
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1050 1050
 
1051
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
1051
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
1052 1052
 			if ($icon == 'icon') { echo "<img src='../img/group.gif' align=\"absmiddle\" alt='group'>"; }
1053 1053
 
1054 1054
 			if ($builder != 'builder')
1055 1055
 			{
1056
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
1056
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
1057 1057
 				if ($desc != '') {
1058 1058
 					if ($icon != 'wrap') {
1059
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1059
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
1060 1060
 					else {
1061
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1061
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
1062 1062
 				}
1063 1063
 			} else {
1064
-				echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
1064
+				echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
1065 1065
 			}
1066 1066
 			break;
1067 1067
 		case "Users":
1068
-			$name=get_lang('Users');
1069
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1070
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1071
-			if ($row['title'] != '') { $name=$row['title']; }
1072
-			$desc=$row['description'];
1073
-			echo str_repeat("&nbsp;&gt;",$level);
1068
+			$name = get_lang('Users');
1069
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
1070
+			$result = Database::query($sql); $row = Database::fetch_array($result);
1071
+			if ($row['title'] != '') { $name = $row['title']; }
1072
+			$desc = $row['description'];
1073
+			echo str_repeat("&nbsp;&gt;", $level);
1074 1074
 
1075 1075
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
1076 1076
 			if ($icon != 'nolink') {
1077
-				if ($completed=='completed') {
1077
+				if ($completed == 'completed') {
1078 1078
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
1079
-				}	else {
1079
+				} else {
1080 1080
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
1081 1081
 					//echo "&nbsp;";
1082 1082
 				}
1083 1083
 			}
1084 1084
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
1085 1085
 
1086
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1086
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
1087 1087
 
1088
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
1088
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
1089 1089
 			if ($icon == 'icon') { echo "<img src='../img/members.gif' align=\"absmiddle\" alt='members'>"; }
1090 1090
 
1091 1091
 			if ($builder != 'builder')
1092 1092
 			{
1093
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1093
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
1094 1094
 				if ($desc != '') {
1095 1095
 					if ($icon != 'wrap') {
1096
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
1096
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
1097 1097
 					else {
1098
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
1098
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
1099 1099
 				}
1100 1100
 			} else {
1101
-				echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
1101
+				echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
1102 1102
 			}
1103 1103
 			break;
1104 1104
 	}//end huge switch-statement
@@ -1117,29 +1117,29 @@  discard block
 block discarded – undo
1117 1117
 function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
1118 1118
 {
1119 1119
 	global $_course, $learnpath_id, $tbl_learnpath_item, $items;
1120
-	global $curDirPath, $_configuration, $enableDocumentParsing, $_user , $_cid;
1120
+	global $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid;
1121 1121
 
1122 1122
 	$hyperlink_target_parameter = ""; //or e.g. target='_blank'
1123 1123
  $builder = 'player';
1124
-	$origin='learnpath';
1124
+	$origin = 'learnpath';
1125 1125
 
1126
-	$linktype=$type;
1127
-	if (($type=="Link _self") or ($type=="Link _blank")) { $type="Link"; }
1126
+	$linktype = $type;
1127
+	if (($type == "Link _self") or ($type == "Link _blank")) { $type = "Link"; }
1128 1128
 
1129 1129
  $link = '';
1130 1130
 
1131 1131
 	switch ($type)
1132 1132
 	{
1133 1133
 		case "Agenda":
1134
-			$TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);;
1134
+			$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA); ;
1135 1135
 			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
1136
-			$myrow=Database::fetch_array($result);
1136
+			$myrow = Database::fetch_array($result);
1137 1137
 
1138
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1139
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1140
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
1141
-			$desc=$row['description'];
1142
-			$agenda_id=$row['item_id'];
1138
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
1139
+			$result = Database::query($sql); $row = Database::fetch_array($result);
1140
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
1141
+			$desc = $row['description'];
1142
+			$agenda_id = $row['item_id'];
1143 1143
 
1144 1144
 			if ($builder != 'builder')
1145 1145
 			{
@@ -1154,7 +1154,7 @@  discard block
 block discarded – undo
1154 1154
 		case "Ad_Valvas":
1155 1155
 			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
1156 1156
 			$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
1157
-			$myrow=Database::fetch_array($result);
1157
+			$myrow = Database::fetch_array($result);
1158 1158
 
1159 1159
 			if ($builder != 'builder')
1160 1160
 			{
@@ -1167,14 +1167,14 @@  discard block
 block discarded – undo
1167 1167
 			break;
1168 1168
 
1169 1169
 		case "Link" :
1170
-			$TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
1171
-			$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
1172
-			$myrow=Database::fetch_array($result);
1170
+			$TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
1171
+			$result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
1172
+			$myrow = Database::fetch_array($result);
1173 1173
 
1174
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1175
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1174
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
1175
+			$result = Database::query($sql); $row = Database::fetch_array($result);
1176 1176
 
1177
-			$thelink=$myrow["url"];
1177
+			$thelink = $myrow["url"];
1178 1178
 			if ($builder != 'builder')
1179 1179
 			{
1180 1180
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
@@ -1186,16 +1186,16 @@  discard block
 block discarded – undo
1186 1186
 			break;
1187 1187
 
1188 1188
 		case "Exercise":
1189
-			$TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
1190
-			$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
1191
-			$myrow=Database::fetch_array($result);
1189
+			$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
1190
+			$result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
1191
+			$myrow = Database::fetch_array($result);
1192 1192
 
1193
-			if ($builder=='builder') { $origin='builder'; }
1193
+			if ($builder == 'builder') { $origin = 'builder'; }
1194 1194
 			  //this is needed for the exercise_submit.php can delete the session info about tests
1195 1195
 
1196
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1197
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1198
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
1196
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
1197
+			$result = Database::query($sql); $row = Database::fetch_array($result);
1198
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
1199 1199
 
1200 1200
 			if ($builder != 'builder')
1201 1201
 			{
@@ -1208,14 +1208,14 @@  discard block
 block discarded – undo
1208 1208
 			break;
1209 1209
 
1210 1210
 		case "HotPotatoes":
1211
-	  	    $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
1212
-		    $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
1211
+	  	    $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
1212
+		    $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
1213 1213
 			$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
1214
-		    $myrow= Database::fetch_array($result);
1215
-		    $path=$myrow["path"];
1216
-		  	$name=GetQuizName($path,$documentPath);
1214
+		    $myrow = Database::fetch_array($result);
1215
+		    $path = $myrow["path"];
1216
+		  	$name = GetQuizName($path, $documentPath);
1217 1217
 
1218
-			if ($builder=='builder') { $origin='builder'; }
1218
+			if ($builder == 'builder') { $origin = 'builder'; }
1219 1219
 
1220 1220
 			$cid = $_course['official_code'];
1221 1221
 
@@ -1232,18 +1232,18 @@  discard block
 block discarded – undo
1232 1232
 		case "Forum":
1233 1233
         //deprecated
1234 1234
 			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
1235
-			$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
1236
-			$myrow=Database::fetch_array($result);
1235
+			$result = Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
1236
+			$myrow = Database::fetch_array($result);
1237 1237
 
1238
-			if ($builder=='builder') { $origin='builder'; }
1238
+			if ($builder == 'builder') { $origin = 'builder'; }
1239 1239
 
1240
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1241
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1242
-			if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
1240
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
1241
+			$result = Database::query($sql); $row = Database::fetch_array($result);
1242
+			if ($row['title'] != '') { $myrow["forum_name"] = $row['title']; }
1243 1243
 
1244
-			if ($myrow["forum_name"]=='') { $type="Forum"; }
1244
+			if ($myrow["forum_name"] == '') { $type = "Forum"; }
1245 1245
 
1246
-			$forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
1246
+			$forumparameters = "forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
1247 1247
 			if ($builder != 'builder')
1248 1248
 			{
1249 1249
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
@@ -1256,15 +1256,15 @@  discard block
 block discarded – undo
1256 1256
 
1257 1257
 		case "Thread":  //forum post
1258 1258
         //deprecated
1259
-			$tbl_topics      = $_course['dbNameGlu'].'bb_topics';
1260
-			$tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
1259
+			$tbl_topics = $_course['dbNameGlu'].'bb_topics';
1260
+			$tbl_posts = $_course['dbNameGlu'].'bb_posts';
1261 1261
 			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
1262
-			$sql="SELECT * FROM $tbl_topics where topic_id=$id";
1263
-			$result= Database::query($sql);
1264
-			$myrow=Database::fetch_array($result);
1262
+			$sql = "SELECT * FROM $tbl_topics where topic_id=$id";
1263
+			$result = Database::query($sql);
1264
+			$myrow = Database::fetch_array($result);
1265 1265
 
1266
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1267
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1266
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
1267
+			$result = Database::query($sql); $row = Database::fetch_array($result);
1268 1268
 
1269 1269
 			if ($builder != 'builder')
1270 1270
 			{
@@ -1278,16 +1278,16 @@  discard block
 block discarded – undo
1278 1278
 		case "Post":
1279 1279
 			break;
1280 1280
 		case "Document":
1281
-			$dbTable  = Database::get_course_table(TABLE_DOCUMENT);
1282
-			$result=Database::query("SELECT * FROM $dbTable WHERE id=$id",__FILE__,__LINE);
1283
-			$myrow=Database::fetch_array($result);
1281
+			$dbTable = Database::get_course_table(TABLE_DOCUMENT);
1282
+			$result = Database::query("SELECT * FROM $dbTable WHERE id=$id", __FILE__, __LINE);
1283
+			$myrow = Database::fetch_array($result);
1284 1284
 
1285
-			$pathname=explode("/",$myrow["path"]); // making a correct name for the link
1286
-			$last=count($pathname)-1;  // making a correct name for the link
1287
-			$filename=$pathname[$last];  // making a correct name for the link
1285
+			$pathname = explode("/", $myrow["path"]); // making a correct name for the link
1286
+			$last = count($pathname) - 1; // making a correct name for the link
1287
+			$filename = $pathname[$last]; // making a correct name for the link
1288 1288
 
1289
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
1290
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
1289
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
1290
+			$result = Database::query($sql); $row = Database::fetch_array($result);
1291 1291
 
1292 1292
 			if ($builder != 'builder')
1293 1293
 			{
@@ -1296,10 +1296,10 @@  discard block
 block discarded – undo
1296 1296
 			}
1297 1297
 			else
1298 1298
 			{
1299
-				$enableDocumentParsing='yes';
1299
+				$enableDocumentParsing = 'yes';
1300 1300
 				if (!$enableDocumentParsing)
1301 1301
 				{ //this is the solution for the non-parsing version in the builder
1302
-					$file=urlencode($myrow["path"]);
1302
+					$file = urlencode($myrow["path"]);
1303 1303
 					$link .= "../document/showinframes.php?file=$file";
1304 1304
 				}
1305 1305
 				else
@@ -1341,7 +1341,7 @@  discard block
 block discarded – undo
1341 1341
 			{
1342 1342
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
1343 1343
 			} else {
1344
-				$s=api_get_path(WEB_CODE_PATH)."course_description";
1344
+				$s = api_get_path(WEB_CODE_PATH)."course_description";
1345 1345
 				$link .= $s;
1346 1346
 			}
1347 1347
 			break;
@@ -1375,8 +1375,8 @@  discard block
 block discarded – undo
1375 1375
 	$addedresourceid = $_SESSION['addedresourceid'];
1376 1376
 	unset($addedresource[$resource_key]);
1377 1377
 	unset($addedresourceid[$resource_key]);
1378
-	$_SESSION['addedresource']=$addedresource;
1379
-	$_SESSION['addedresourceid']=$addedresourceid ;
1378
+	$_SESSION['addedresource'] = $addedresource;
1379
+	$_SESSION['addedresourceid'] = $addedresourceid;
1380 1380
 }
1381 1381
 
1382 1382
 /**
@@ -1409,9 +1409,9 @@  discard block
 block discarded – undo
1409 1409
 function delete_added_resource($type, $id)
1410 1410
 {
1411 1411
 	global $_course;
1412
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1412
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
1413 1413
 
1414
-	$sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1414
+	$sql = "DELETE FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1415 1415
 	Database::query($sql);
1416 1416
 }
1417 1417
 
@@ -1422,9 +1422,9 @@  discard block
 block discarded – undo
1422 1422
 function delete_all_resources_type($type)
1423 1423
 {
1424 1424
   global $_course;
1425
-  $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1425
+  $TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
1426 1426
 
1427
-  $sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type'";
1427
+  $sql = "DELETE FROM $TABLERESOURCE WHERE source_type='$type'";
1428 1428
 
1429 1429
   Database::query($sql);
1430 1430
 }
@@ -1435,11 +1435,11 @@  discard block
 block discarded – undo
1435 1435
 function check_added_resources($type, $id)
1436 1436
 {
1437 1437
 	global $_course, $origin;
1438
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1439
-	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1440
-	$result=Database::query($sql);
1441
-	$number_added=Database::num_rows($result);
1442
-	if ($number_added<>0)
1438
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
1439
+	$sql = "SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1440
+	$result = Database::query($sql);
1441
+	$number_added = Database::num_rows($result);
1442
+	if ($number_added <> 0)
1443 1443
 		return true;
1444 1444
 	else
1445 1445
 		return false;
@@ -1452,18 +1452,18 @@  discard block
 block discarded – undo
1452 1452
 */
1453 1453
 function edit_added_resources($type, $id)
1454 1454
 {
1455
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1455
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
1456 1456
     $course_id = api_get_course_int_id();
1457 1457
     $id = intval($id);
1458 1458
     $type = Database::escape_string($type);
1459
-	$sql="SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
1460
-	$result=Database::query($sql);
1461
-	while ($row=Database::fetch_array($result))	{
1462
-		$addedresource[]=$row["resource_type"];
1463
-		$addedresourceid[]=$row["resource_id"];
1459
+	$sql = "SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
1460
+	$result = Database::query($sql);
1461
+	while ($row = Database::fetch_array($result)) {
1462
+		$addedresource[] = $row["resource_type"];
1463
+		$addedresourceid[] = $row["resource_id"];
1464 1464
 	}
1465
-	$_SESSION['addedresource']=$addedresource;
1466
-	$_SESSION['addedresourceid']=$addedresourceid;
1465
+	$_SESSION['addedresource'] = $addedresource;
1466
+	$_SESSION['addedresourceid'] = $addedresourceid;
1467 1467
 }
1468 1468
 
1469 1469
 /**
@@ -1473,12 +1473,12 @@  discard block
 block discarded – undo
1473 1473
 */
1474 1474
 function update_added_resources($type, $id)
1475 1475
 {
1476
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1476
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
1477 1477
     $course_id = api_get_course_int_id();
1478 1478
     $id = intval($id);
1479 1479
     $type = Database::escape_string($type);
1480 1480
 	// delete all the added resources for this item in the database;
1481
-	$sql="DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' AND source_id='$id'";
1481
+	$sql = "DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' AND source_id='$id'";
1482 1482
 	//echo $sql;
1483 1483
 	Database::query($sql);
1484 1484
 
@@ -1492,25 +1492,25 @@  discard block
 block discarded – undo
1492 1492
 /**
1493 1493
 * this function is to display the resources that were added to a specific item
1494 1494
 */
1495
-function display_added_resources($type, $id, $style='')
1495
+function display_added_resources($type, $id, $style = '')
1496 1496
 {
1497 1497
 	// the array containing the icons
1498
-	$arr_icons=array('Agenda'=>'../img/agenda.gif', 'Ad Valvas'=>'../img/valves.gif', 'Link'=>'../img/links.gif', 'Exercise'=>'../img/quiz.gif' );
1498
+	$arr_icons = array('Agenda'=>'../img/agenda.gif', 'Ad Valvas'=>'../img/valves.gif', 'Link'=>'../img/links.gif', 'Exercise'=>'../img/quiz.gif');
1499 1499
 
1500 1500
 	global $_course, $origin;
1501
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
1501
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
1502 1502
 
1503
-	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1504
-	$result=Database::query($sql);
1505
-	while ($row=Database::fetch_array($result))
1503
+	$sql = "SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
1504
+	$result = Database::query($sql);
1505
+	while ($row = Database::fetch_array($result))
1506 1506
 	{
1507 1507
 		if ($origin != 'learnpath')
1508 1508
 		{
1509
-			display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
1509
+			display_addedresource_link($row['resource_type'], $row['resource_id'], $style);
1510 1510
 		}
1511 1511
 		else
1512 1512
 		{
1513
-			display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
1513
+			display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'], 'agendaitems', '', 'builder', 'icon'); echo "<br>";
1514 1514
 		}
1515 1515
 	}
1516 1516
 }
@@ -1529,7 +1529,7 @@  discard block
 block discarded – undo
1529 1529
 	global $locationkey;
1530 1530
 	global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
1531 1531
 
1532
-	if ($resourceaction=="removeresource")
1532
+	if ($resourceaction == "removeresource")
1533 1533
 	{
1534 1534
 		/* unneccessary because when editing we delete all the added resources from the
1535 1535
 		database and add all these from the session
@@ -1550,8 +1550,8 @@  discard block
 block discarded – undo
1550 1550
 		//echo "remove from session";
1551 1551
 		remove_resource($locationkey);
1552 1552
 	}
1553
-	$addedresource=$_SESSION['addedresource'];
1554
-	$addedresourceid=$_SESSION['addedresourceid'];
1553
+	$addedresource = $_SESSION['addedresource'];
1554
+	$addedresourceid = $_SESSION['addedresourceid'];
1555 1555
 	if (is_array($addedresource))
1556 1556
 	{
1557 1557
 		echo '<table>';
@@ -1559,16 +1559,16 @@  discard block
 block discarded – undo
1559 1559
 		{
1560 1560
 			//echo $resource.":".$addedresourceid[key($addedresource)];
1561 1561
 			echo '<tr><td>';
1562
-			display_addedresource_link($resource,$addedresourceid[key($addedresource)]);
1562
+			display_addedresource_link($resource, $addedresourceid[key($addedresource)]);
1563 1563
 			echo '</td><td width="30">';
1564 1564
 
1565 1565
 			// if $_SERVER['REQUEST_URI'] contains and ?id=xx we have an edit and the url for deleting a session added resource
1566 1566
 			// should also contain this id.
1567
-			$test=parse_url($_SERVER['REQUEST_URI']);
1567
+			$test = parse_url($_SERVER['REQUEST_URI']);
1568 1568
 			$output = array();
1569
-			parse_str($test['query'],$output);
1569
+			parse_str($test['query'], $output);
1570 1570
 
1571
-			if ($showdeleteimg==1)
1571
+			if ($showdeleteimg == 1)
1572 1572
 			{
1573 1573
 				echo "<a href=".api_get_self()."?showresources=true&amp;source_forum=".$_GET['source_forum']."&amp;resourceaction=removeresource&amp;locationkey=".key($addedresource)."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no><img src='../img/delete.gif' border='0' alt='resource ".get_lang('Delete')."' /></a><br />";
1574 1574
 			}
@@ -1596,8 +1596,8 @@  discard block
 block discarded – undo
1596 1596
 	global $from_learnpath, $source_id, $action, $learnpath_id, $chapter_id, $originalresource, $folder, $content, $target;
1597 1597
 	//global $_SESSION['addresource'];
1598 1598
 	//global $_SESSION['addresourceid'];
1599
-	$addedresource=$_SESSION['addedresource'];
1600
-	$addedresourceid=$_SESSION['addedresourceid'];
1599
+	$addedresource = $_SESSION['addedresource'];
1600
+	$addedresourceid = $_SESSION['addedresourceid'];
1601 1601
 
1602 1602
 	if (is_array($_SESSION['addedresource']))
1603 1603
 	{
@@ -1610,16 +1610,16 @@  discard block
 block discarded – undo
1610 1610
 			//print_r($addedresourceid);
1611 1611
 			//echo "<br>";
1612 1612
 
1613
-			if ($toolcompare==$type and $addedresourceid[key($addedresource)]==$id)
1613
+			if ($toolcompare == $type and $addedresourceid[key($addedresource)] == $id)
1614 1614
 			{
1615
-				$show=0;
1615
+				$show = 0;
1616 1616
 			}
1617 1617
 			next($addedresource);
1618 1618
 		}
1619
-		if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
1620
-		if ($show!==0)
1619
+		if ($from_learnpath) { $lang_add_it_or_resource = get_lang('AddIt'); } else { $lang_add_it_or_resource = get_lang('AddResource'); }
1620
+		if ($show !== 0)
1621 1621
 		{
1622
-			if ($type=="Document")
1622
+			if ($type == "Document")
1623 1623
 			{
1624 1624
 				echo "<a href=".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".$lang_add_it_or_resource."</a>";
1625 1625
 			}
@@ -1631,9 +1631,9 @@  discard block
 block discarded – undo
1631 1631
 	}
1632 1632
 	else // if it is not an array, it is a string
1633 1633
 	{
1634
-		if ($_SESSION['addedresource']!==$type or $_SESSION['addedresourceid']!==$id)
1634
+		if ($_SESSION['addedresource'] !== $type or $_SESSION['addedresourceid'] !== $id)
1635 1635
 		{
1636
-			if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
1636
+			if ($from_learnpath) { $lang_add_it_or_resource = get_lang('AddIt'); } else { $lang_add_it_or_resource = get_lang('AddResource'); }
1637 1637
 			echo "<a href='".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
1638 1638
 		}
1639 1639
 	}
Please login to merge, or discard this patch.
main/user/user.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -735,7 +735,6 @@
 block discarded – undo
735 735
  * lock = the user can no longer use this account
736 736
  * @author Patrick Cool <[email protected]>, Ghent University
737 737
  * @param int $active the current state of the account
738
- * @param int $user_id The user id
739 738
  * @param string $urlParams
740 739
  *
741 740
  * @return string Some HTML-code with the lock/unlock button
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  */
14 14
 $use_anonymous = true;
15 15
 require_once '../inc/global.inc.php';
16
-$current_course_tool  = TOOL_USER;
16
+$current_course_tool = TOOL_USER;
17 17
 $this_section = SECTION_COURSES;
18 18
 
19 19
 // notice for unauthorized people.
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
 //Can't auto unregister from a session
43 43
 if (!empty($sessionId)) {
44
-    $course_info['unsubscribe']  = 0;
44
+    $course_info['unsubscribe'] = 0;
45 45
 }
46 46
 
47 47
 /* Unregistering a user section	*/
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
                             '#',
185 185
                             get_lang('UserPicture'),
186 186
                             get_lang('OfficialCode'),
187
-                            get_lang('FirstName') . ', ' . get_lang('LastName'),
187
+                            get_lang('FirstName').', '.get_lang('LastName'),
188 188
                             get_lang('Email'),
189 189
                             get_lang('Phone')
190 190
                         );
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
                             '#',
194 194
                             get_lang('UserPicture'),
195 195
                             get_lang('OfficialCode'),
196
-                            get_lang('LastName') . ', ' . get_lang('FirstName'),
196
+                            get_lang('LastName').', '.get_lang('FirstName'),
197 197
                             get_lang('Email'),
198 198
                             get_lang('Phone')
199 199
                         );
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
                     if (api_is_multiple_url_enabled()) {
219 219
                         $sql .= ' , '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).' au ';
220 220
                     }
221
-                    $sql .=" WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id ";
221
+                    $sql .= " WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id ";
222 222
                     $sql .= ' AND session_id = '.$sessionId;
223 223
 
224 224
                     if (api_is_multiple_url_enabled()) {
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
                             true
253 253
                         );
254 254
                         if (!empty($extra_fields)) {
255
-                            foreach($extra_fields as $key => $extra_value) {
255
+                            foreach ($extra_fields as $key => $extra_value) {
256 256
                                 $user[$key] = $extra_value;
257 257
                             }
258 258
                         }
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
                                     $counter,
267 267
                                     $user_image,
268 268
                                     $user['official_code'],
269
-                                    $user['firstname'] . ', ' . $user['lastname'],
269
+                                    $user['firstname'].', '.$user['lastname'],
270 270
                                     $user['email'],
271 271
                                     $user['phone']
272 272
                                 );
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
                                     $counter,
276 276
                                     $user_image,
277 277
                                     $user['official_code'],
278
-                                    $user['lastname'] . ', ' . $user['firstname'],
278
+                                    $user['lastname'].', '.$user['firstname'],
279 279
                                     $user['email'],
280 280
                                     $user['phone']
281 281
                                 );
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
                                     $counter,
355 355
                                     $user_image,
356 356
                                     $user['official_code'],
357
-                                    $user['firstname'] . ', ' . $user['lastname'],
357
+                                    $user['firstname'].', '.$user['lastname'],
358 358
                                     $user['email'],
359 359
                                     $user['phone']
360 360
                                 );
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
                                     $counter,
364 364
                                     $user_image,
365 365
                                     $user['official_code'],
366
-                                    $user['lastname'] . ', ' . $user['firstname'],
366
+                                    $user['lastname'].', '.$user['firstname'],
367 367
                                     $user['email'],
368 368
                                     $user['phone']
369 369
                                 );
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
                 $userInfo = api_get_user_info($user_id);
701 701
                 $userPicture = $userInfo['avatar'];
702 702
 
703
-                $photo= '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />';
703
+                $photo = '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />';
704 704
 
705 705
                 $temp[] = $user_id;
706 706
                 $temp[] = $photo;
@@ -821,7 +821,7 @@  discard block
 block discarded – undo
821 821
         if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' or api_is_platform_admin()) {
822 822
             // unregister
823 823
             if ($user_id != $current_user_id || api_is_platform_admin()) {
824
-                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'.
824
+                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'.
825 825
                     get_lang('Unreg').'</a>&nbsp;';
826 826
             } else {
827 827
                 //$result .= Display::return_icon('unsubscribe_course_na.png', get_lang('Unreg'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
@@ -831,7 +831,7 @@  discard block
 block discarded – undo
831 831
         // Show buttons for unsubscribe
832 832
         if ($course_info['unsubscribe'] == 1) {
833 833
             if ($user_id == $current_user_id) {
834
-                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'.
834
+                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'.
835 835
                     get_lang('Unreg').'</a>&nbsp;';
836 836
             }
837 837
         }
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
 
908 908
     // Actions column
909 909
     $table->set_header($header_nr++, get_lang('Action'), false);
910
-    $table->set_column_filter($header_nr-1, 'modify_filter');
910
+    $table->set_column_filter($header_nr - 1, 'modify_filter');
911 911
 
912 912
     if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') {
913 913
         $table->set_form_actions(array('unsubscribe' => get_lang('Unreg')), 'user');
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
915 915
 } else {
916 916
     if ($course_info['unsubscribe'] == 1) {
917 917
         $table->set_header($header_nr++, get_lang('Action'), false);
918
-        $table->set_column_filter($header_nr-1, 'modify_filter');
918
+        $table->set_column_filter($header_nr - 1, 'modify_filter');
919 919
     }
920 920
 }
921 921
 
@@ -971,19 +971,19 @@  discard block
 block discarded – undo
971 971
     echo '<div class="col-md-6">';
972 972
     echo $icon;
973 973
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=csv&type='.$type.'">'.
974
-        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
974
+        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a> ';
975 975
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=xls&type='.$type.'">'.
976
-        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a> ';
976
+        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a> ';
977 977
 
978 978
     if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' ||
979 979
         api_is_platform_admin()
980 980
     ) {
981 981
         $actions .= '<a href="user_import.php?'.api_get_cidreq().'&action=import">'.
982
-            Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'),'',ICON_SIZE_MEDIUM).'</a> ';
982
+            Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'), '', ICON_SIZE_MEDIUM).'</a> ';
983 983
     }
984 984
 
985 985
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=pdf&type='.$type.'">'.
986
-        Display::return_icon('pdf.png', get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a> ';
986
+        Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a> ';
987 987
     echo $actions;
988 988
 
989 989
     echo '</div>';
Please login to merge, or discard this patch.
main/webservices/additional_webservices.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 }
85 85
 
86 86
 /**
87
- * @param $directoryPath
87
+ * @param string $directoryPath
88 88
  * @return bool
89 89
  */
90 90
 function deleteDirectory($directoryPath)
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -19,12 +19,12 @@  discard block
 block discarded – undo
19 19
 {
20 20
     $fileData = $pptData['file_data'];
21 21
     $dataInfo = pathinfo($pptData['file_name']);
22
-    $fileName =  basename($pptData['file_name'], '.' . $dataInfo['extension']);
22
+    $fileName = basename($pptData['file_name'], '.'.$dataInfo['extension']);
23 23
     $fullFileName = $pptData['file_name'];
24 24
 
25 25
     $tempArchivePath = api_get_path(SYS_ARCHIVE_PATH);
26
-    $tempPath = $tempArchivePath . 'wsConvert/' . $fileName . '/';
27
-    $tempPathNewFiles = $tempArchivePath . 'wsConvert/' . $fileName . '-n/';
26
+    $tempPath = $tempArchivePath.'wsConvert/'.$fileName.'/';
27
+    $tempPathNewFiles = $tempArchivePath.'wsConvert/'.$fileName.'-n/';
28 28
 
29 29
     $perms = api_get_permissions_for_new_directories();
30 30
     if (!is_dir($tempPath)) {
@@ -33,28 +33,28 @@  discard block
 block discarded – undo
33 33
     if (!is_dir($tempPathNewFiles)) {
34 34
         mkdir($tempPathNewFiles, $perms, true);
35 35
     }
36
-    if (!is_dir($tempPathNewFiles . $fileName)) {
37
-        mkdir($tempPathNewFiles . $fileName, $perms, true);
36
+    if (!is_dir($tempPathNewFiles.$fileName)) {
37
+        mkdir($tempPathNewFiles.$fileName, $perms, true);
38 38
     }
39 39
 
40 40
     $file = base64_decode($fileData);
41
-    file_put_contents($tempPath . $fullFileName, $file);
41
+    file_put_contents($tempPath.$fullFileName, $file);
42 42
 
43 43
     if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
44
-        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png');
45
-        $classPath = $converterPath . ';' . $converterPath . '/jodconverter-2.2.2.jar;' . $converterPath . '/jodconverter-cli-2.2.2.jar';
46
-        $cmd = 'java -Dfile.encoding=UTF-8 -cp "' . $classPath . '" DokeosConverter';
44
+        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
45
+        $classPath = $converterPath.';'.$converterPath.'/jodconverter-2.2.2.jar;'.$converterPath.'/jodconverter-cli-2.2.2.jar';
46
+        $cmd = 'java -Dfile.encoding=UTF-8 -cp "'.$classPath.'" DokeosConverter';
47 47
     } else {
48
-        $converterPath = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png';
48
+        $converterPath = api_get_path(SYS_PATH).'main/inc/lib/ppt2png';
49 49
         $classPath = ' -Dfile.encoding=UTF-8 -cp .:jodconverter-2.2.2.jar:jodconverter-cli-2.2.2.jar';
50
-        $cmd = 'cd ' . $converterPath . ' && java ' . $classPath . ' DokeosConverter';
50
+        $cmd = 'cd '.$converterPath.' && java '.$classPath.' DokeosConverter';
51 51
     }
52 52
 
53
-    $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port');
54
-    $cmd .= ' -w 720 -h 540 -d oogie "' . $tempPath . $fullFileName.'"  "' . $tempPathNewFiles . $fileName . '.html"';
53
+    $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port');
54
+    $cmd .= ' -w 720 -h 540 -d oogie "'.$tempPath.$fullFileName.'"  "'.$tempPathNewFiles.$fileName.'.html"';
55 55
 
56 56
     $perms = api_get_permissions_for_new_files();
57
-    chmod($tempPathNewFiles . $fileName, $perms);
57
+    chmod($tempPathNewFiles.$fileName, $perms);
58 58
 
59 59
     $files = array();
60 60
     $return = 0;
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
         $images = array();
65 65
         foreach ($files as $file) {
66 66
             $imageData = explode('||', $file);
67
-            $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles . $fileName . '/' . $imageData[1]));
67
+            $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles.$fileName.'/'.$imageData[1]));
68 68
         }
69 69
         $data = array(
70 70
             'files' => $files,
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
  */
90 90
 function deleteDirectory($directoryPath)
91 91
 {
92
-    $files = array_diff(scandir($directoryPath), array('.','..'));
92
+    $files = array_diff(scandir($directoryPath), array('.', '..'));
93 93
     foreach ($files as $file) {
94 94
         if (is_dir("$directoryPath/$file")) {
95 95
             deleteDirectory("$directoryPath/$file");
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 $webCodePath = api_get_path(WEB_CODE_PATH);
107 107
 $options = array(
108 108
     'uri' => $webPath,
109
-    'location' => $webCodePath . 'webservices/additional_webservices.php'
109
+    'location' => $webCodePath.'webservices/additional_webservices.php'
110 110
 );
111 111
 
112 112
 $soapServer = new SoapServer(NULL, $options);
Please login to merge, or discard this patch.
main/webservices/cm_webservice.php 4 patches
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,6 +32,8 @@  discard block
 block discarded – undo
32 32
 	 *
33 33
 	 * @param int Error code
34 34
 	 * @param string Error message
35
+	 * @param integer $code
36
+	 * @param string $message
35 37
 	 */
36 38
 	public function __construct($code, $message) {
37 39
 		$this->code = $code;
@@ -42,6 +44,7 @@  discard block
 block discarded – undo
42 44
 	 * Sets the error handler
43 45
 	 *
44 46
 	 * @param WSErrorHandler Error handler
47
+	 * @param WSCMSoapErrorHandler $handler
45 48
 	 */
46 49
 	public static function setErrorHandler($handler) {
47 50
 		if($handler instanceof WSErrorHandler) {
@@ -76,6 +79,7 @@  discard block
 block discarded – undo
76 79
 	 * Handle method
77 80
 	 *
78 81
 	 * @param WSError Error
82
+	 * @return void
79 83
 	 */
80 84
 	public function handle($error);
81 85
 }
@@ -102,7 +106,7 @@  discard block
 block discarded – undo
102 106
 	 * Verifies the API key
103 107
 	 *
104 108
 	 * @param string Secret key
105
-	 * @return mixed WSError in case of failure, null in case of success
109
+	 * @return WSCMError|null WSError in case of failure, null in case of success
106 110
 	 */
107 111
 	protected function verifyKey($secret_key) {
108 112
 		$ip = trim($_SERVER['REMOTE_ADDR']);
Please login to merge, or discard this patch.
Indentation   +198 added lines, -198 removed lines patch added patch discarded remove patch
@@ -6,120 +6,120 @@  discard block
 block discarded – undo
6 6
  * Error returned by one of the methods of the web service. Contains an error code and an error message
7 7
  */
8 8
 class WSCMError {
9
-	/**
10
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
11
-	 *
12
-	 * @var WSErrorHandler
13
-	 */
14
-	protected static $_handler;
9
+    /**
10
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
11
+     *
12
+     * @var WSErrorHandler
13
+     */
14
+    protected static $_handler;
15 15
 
16
-	/**
17
-	 * Error code
18
-	 *
19
-	 * @var int
20
-	 */
21
-	public $code;
16
+    /**
17
+     * Error code
18
+     *
19
+     * @var int
20
+     */
21
+    public $code;
22 22
 
23
-	/**
24
-	 * Error message
25
-	 *
26
-	 * @var string
27
-	 */
28
-	public $message;
23
+    /**
24
+     * Error message
25
+     *
26
+     * @var string
27
+     */
28
+    public $message;
29 29
 
30
-	/**
31
-	 * Constructor
32
-	 *
33
-	 * @param int Error code
34
-	 * @param string Error message
35
-	 */
36
-	public function __construct($code, $message) {
37
-		$this->code = $code;
38
-		$this->message = $message;
39
-	}
30
+    /**
31
+     * Constructor
32
+     *
33
+     * @param int Error code
34
+     * @param string Error message
35
+     */
36
+    public function __construct($code, $message) {
37
+        $this->code = $code;
38
+        $this->message = $message;
39
+    }
40 40
 
41
-	/**
42
-	 * Sets the error handler
43
-	 *
44
-	 * @param WSErrorHandler Error handler
45
-	 */
46
-	public static function setErrorHandler($handler) {
47
-		if($handler instanceof WSErrorHandler) {
48
-			self::$_handler = $handler;
49
-		}
50
-	}
41
+    /**
42
+     * Sets the error handler
43
+     *
44
+     * @param WSErrorHandler Error handler
45
+     */
46
+    public static function setErrorHandler($handler) {
47
+        if($handler instanceof WSErrorHandler) {
48
+            self::$_handler = $handler;
49
+        }
50
+    }
51 51
 
52
-	/**
53
-	 * Returns the error handler
54
-	 *
55
-	 * @return WSErrorHandler Error handler
56
-	 */
57
-	public static function getErrorHandler() {
58
-		return self::$_handler;
59
-	}
52
+    /**
53
+     * Returns the error handler
54
+     *
55
+     * @return WSErrorHandler Error handler
56
+     */
57
+    public static function getErrorHandler() {
58
+        return self::$_handler;
59
+    }
60 60
 
61
-	/**
62
-	 * Transforms the error into an array
63
-	 *
64
-	 * @return array Associative array with code and message
65
-	 */
66
-	public function toArray() {
67
-		return array('code' => $this->code, 'message' => $this->message);
68
-	}
61
+    /**
62
+     * Transforms the error into an array
63
+     *
64
+     * @return array Associative array with code and message
65
+     */
66
+    public function toArray() {
67
+        return array('code' => $this->code, 'message' => $this->message);
68
+    }
69 69
 }
70 70
 
71 71
 /**
72 72
  * Interface that must be implemented by any error handler
73 73
  */
74 74
 interface WSCMErrorHandler {
75
-	/**
76
-	 * Handle method
77
-	 *
78
-	 * @param WSError Error
79
-	 */
80
-	public function handle($error);
75
+    /**
76
+     * Handle method
77
+     *
78
+     * @param WSError Error
79
+     */
80
+    public function handle($error);
81 81
 }
82 82
 
83 83
 /**
84 84
  * Main class of the webservice. Webservice classes extend this class
85 85
  */
86 86
 class WSCM {
87
-	/**
88
-	 * Chamilo configuration
89
-	 *
90
-	 * @var array
91
-	 */
92
-	protected $_configuration;
87
+    /**
88
+     * Chamilo configuration
89
+     *
90
+     * @var array
91
+     */
92
+    protected $_configuration;
93 93
 
94
-	/**
95
-	 * Constructor
96
-	 */
97
-	public function __construct() {
98
-		$this->_configuration = $GLOBALS['_configuration'];
99
-	}
94
+    /**
95
+     * Constructor
96
+     */
97
+    public function __construct() {
98
+        $this->_configuration = $GLOBALS['_configuration'];
99
+    }
100 100
 
101
-	/**
102
-	 * Verifies the API key
103
-	 *
104
-	 * @param string Secret key
105
-	 * @return mixed WSError in case of failure, null in case of success
106
-	 */
107
-	protected function verifyKey($secret_key) {
108
-		$ip = trim($_SERVER['REMOTE_ADDR']);
109
-		// if we are behind a reverse proxy, assume it will send the
110
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
111
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
112
-		  list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
113
-		  $ip = trim($ip1);
114
-		}
115
-		$security_key = $ip.$this->_configuration['security_key'];
101
+    /**
102
+     * Verifies the API key
103
+     *
104
+     * @param string Secret key
105
+     * @return mixed WSError in case of failure, null in case of success
106
+     */
107
+    protected function verifyKey($secret_key) {
108
+        $ip = trim($_SERVER['REMOTE_ADDR']);
109
+        // if we are behind a reverse proxy, assume it will send the
110
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
111
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
112
+            list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
113
+            $ip = trim($ip1);
114
+        }
115
+        $security_key = $ip.$this->_configuration['security_key'];
116 116
 
117
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
118
-			return new WSCMError(1, "API key is invalid");
119
-		} else {
120
-			return null;
121
-		}
122
-	}
117
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
118
+            return new WSCMError(1, "API key is invalid");
119
+        } else {
120
+            return null;
121
+        }
122
+    }
123 123
 
124 124
         /**
125 125
          * Verifies if the user is valid
@@ -134,12 +134,12 @@  discard block
 block discarded – undo
134 134
             $login = $username;
135 135
             $password = $pass;
136 136
 
137
-	    //lookup the user in the main database
137
+        //lookup the user in the main database
138 138
             $user_table = Database::get_main_table(TABLE_MAIN_USER);
139
-	    $sql = "SELECT user_id, username, password, auth_source, active, expiration_date
139
+        $sql = "SELECT user_id, username, password, auth_source, active, expiration_date
140 140
 	            FROM $user_table
141 141
 	            WHERE username = '".trim(addslashes($login))."'";
142
-	    $result = Database::query($sql);
142
+        $result = Database::query($sql);
143 143
 
144 144
             if (Database::num_rows($result) > 0) {
145 145
                 $uData = Database::fetch_array($result);
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 
172 172
         /**
173 173
          * Return the encrypted pass
174
-		 * @deprecated
174
+         * @deprecated
175 175
          * @param <String> $pass
176 176
          * @return <String> $pass encrypted
177 177
          */
@@ -180,112 +180,112 @@  discard block
 block discarded – undo
180 180
         }*/
181 181
 
182 182
         /**
183
-	 * Gets the real user id based on the user id field name and value. Note that if the user id field name is "chamilo_user_id", it will use the user id
184
-	 * in the system database
185
-	 *
186
-	 * @param string User id field name
187
-	 * @param string User id value
188
-	 * @return mixed System user id if the user was found, WSError otherwise
189
-	 */
190
-	protected function getUserId($user_id_field_name, $user_id_value) {
191
-		if($user_id_field_name == "chamilo_user_id") {
192
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
193
-				return intval($user_id_value);
194
-			} else {
195
-				return new WSCMError(100, "User not found");
196
-			}
197
-		} else {
198
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
199
-			if($user_id == 0) {
200
-				return new WSCMError(100, "User not found");
201
-			} else {
202
-				return $user_id;
203
-			}
204
-		}
205
-	}
183
+         * Gets the real user id based on the user id field name and value. Note that if the user id field name is "chamilo_user_id", it will use the user id
184
+         * in the system database
185
+         *
186
+         * @param string User id field name
187
+         * @param string User id value
188
+         * @return mixed System user id if the user was found, WSError otherwise
189
+         */
190
+    protected function getUserId($user_id_field_name, $user_id_value) {
191
+        if($user_id_field_name == "chamilo_user_id") {
192
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
193
+                return intval($user_id_value);
194
+            } else {
195
+                return new WSCMError(100, "User not found");
196
+            }
197
+        } else {
198
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
199
+            if($user_id == 0) {
200
+                return new WSCMError(100, "User not found");
201
+            } else {
202
+                return $user_id;
203
+            }
204
+        }
205
+    }
206 206
 
207
-	/**
208
-	 * Gets the real course id based on the course id field name and value. Note that if the course id field name is "chamilo_course_id", it will use the course id
209
-	 * in the system database
210
-	 *
211
-	 * @param string Course id field name
212
-	 * @param string Course id value
213
-	 * @return mixed System course id if the course was found, WSError otherwise
214
-	 */
215
-	protected function getCourseId($course_id_field_name, $course_id_value) {
216
-		if($course_id_field_name == "chamilo_course_id") {
217
-			if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
218
-				return intval($course_id_value);
219
-			} else {
220
-				return new WSCMError(200, "Course not found");
221
-			}
222
-		} else {
223
-			$courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name);
224
-			if (empty($courseId)) {
225
-				return new WSCMError(200, "Course not found");
226
-			} else {
227
-				return $courseId;
228
-			}
229
-		}
230
-	}
207
+    /**
208
+     * Gets the real course id based on the course id field name and value. Note that if the course id field name is "chamilo_course_id", it will use the course id
209
+     * in the system database
210
+     *
211
+     * @param string Course id field name
212
+     * @param string Course id value
213
+     * @return mixed System course id if the course was found, WSError otherwise
214
+     */
215
+    protected function getCourseId($course_id_field_name, $course_id_value) {
216
+        if($course_id_field_name == "chamilo_course_id") {
217
+            if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
218
+                return intval($course_id_value);
219
+            } else {
220
+                return new WSCMError(200, "Course not found");
221
+            }
222
+        } else {
223
+            $courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name);
224
+            if (empty($courseId)) {
225
+                return new WSCMError(200, "Course not found");
226
+            } else {
227
+                return $courseId;
228
+            }
229
+        }
230
+    }
231 231
 
232
-	/**
233
-	 * Gets the real session id based on the session id field name and value. Note that if the session id field name is "chamilo_session_id", it will use the session id
234
-	 * in the system database
235
-	 *
236
-	 * @param string Session id field name
237
-	 * @param string Session id value
238
-	 * @return mixed System session id if the session was found, WSError otherwise
239
-	 */
240
-	protected function getSessionId($session_id_field_name, $session_id_value)
241
-	{
242
-		if ($session_id_field_name == "chamilo_session_id") {
243
-			$session = SessionManager::fetch((int)$session_id_value);
244
-			if(!empty($session)) {
245
-				return intval($session_id_value);
246
-			} else {
247
-				return new WSCMError(300, "Session not found");
248
-			}
249
-		} else {
250
-			$session_id = SessionManager::getSessionIdFromOriginalId(
251
-				$session_id_value,
252
-				$session_id_field_name
253
-			);
254
-			if($session_id == 0) {
255
-				return new WSCMError(300, "Session not found");
256
-			} else {
257
-				return $session_id;
258
-			}
259
-		}
260
-	}
232
+    /**
233
+     * Gets the real session id based on the session id field name and value. Note that if the session id field name is "chamilo_session_id", it will use the session id
234
+     * in the system database
235
+     *
236
+     * @param string Session id field name
237
+     * @param string Session id value
238
+     * @return mixed System session id if the session was found, WSError otherwise
239
+     */
240
+    protected function getSessionId($session_id_field_name, $session_id_value)
241
+    {
242
+        if ($session_id_field_name == "chamilo_session_id") {
243
+            $session = SessionManager::fetch((int)$session_id_value);
244
+            if(!empty($session)) {
245
+                return intval($session_id_value);
246
+            } else {
247
+                return new WSCMError(300, "Session not found");
248
+            }
249
+        } else {
250
+            $session_id = SessionManager::getSessionIdFromOriginalId(
251
+                $session_id_value,
252
+                $session_id_field_name
253
+            );
254
+            if($session_id == 0) {
255
+                return new WSCMError(300, "Session not found");
256
+            } else {
257
+                return $session_id;
258
+            }
259
+        }
260
+    }
261 261
 
262
-	/**
263
-	 * Handles an error by calling the WSError error handler
264
-	 *
265
-	 * @param WSError Error
266
-	 */
267
-	protected function handleError($error) {
268
-		$handler = WSCMError::getErrorHandler();
269
-		$handler->handle($error);
270
-	}
262
+    /**
263
+     * Handles an error by calling the WSError error handler
264
+     *
265
+     * @param WSError Error
266
+     */
267
+    protected function handleError($error) {
268
+        $handler = WSCMError::getErrorHandler();
269
+        $handler->handle($error);
270
+    }
271 271
 
272
-	/**
273
-	 * Gets a successful result
274
-	 *
275
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
276
-	 */
277
-	protected function getSuccessfulResult() {
278
-		return array('code' => 0, 'message' => 'Operation was successful');
279
-	}
272
+    /**
273
+     * Gets a successful result
274
+     *
275
+     * @return array Array with a code of 0 and a message 'Operation was successful'
276
+     */
277
+    protected function getSuccessfulResult() {
278
+        return array('code' => 0, 'message' => 'Operation was successful');
279
+    }
280 280
 
281
-	/**
282
-	 * Test function. Returns the string success
283
-	 *
284
-	 * @return string Success
285
-	 */
286
-	public function test() {
287
-		return "success";
288
-	}
281
+    /**
282
+     * Test function. Returns the string success
283
+     *
284
+     * @return string Success
285
+     */
286
+    public function test() {
287
+        return "success";
288
+    }
289 289
 
290 290
         /**
291 291
          * *Strictly* reverts PHP's nl2br() effects (whether it was used in XHTML mode or not)
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @param WSErrorHandler Error handler
45 45
 	 */
46 46
 	public static function setErrorHandler($handler) {
47
-		if($handler instanceof WSErrorHandler) {
47
+		if ($handler instanceof WSErrorHandler) {
48 48
 			self::$_handler = $handler;
49 49
 		}
50 50
 	}
@@ -109,12 +109,12 @@  discard block
 block discarded – undo
109 109
 		// if we are behind a reverse proxy, assume it will send the
110 110
 		// HTTP_X_FORWARDED_FOR header and use this IP instead
111 111
 		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
112
-		  list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
112
+		  list($ip1, $ip2) = split(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
113 113
 		  $ip = trim($ip1);
114 114
 		}
115 115
 		$security_key = $ip.$this->_configuration['security_key'];
116 116
 
117
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
117
+		if (!api_is_valid_secret_key($secret_key, $security_key)) {
118 118
 			return new WSCMError(1, "API key is invalid");
119 119
 		} else {
120 120
 			return null;
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
                     // Check the user's password
150 150
                         if ($password == $uData['password'] AND (trim($login) == $uData['username'])) {
151 151
                         // Check if the account is active (not locked)
152
-                            if ($uData['active']=='1') {
152
+                            if ($uData['active'] == '1') {
153 153
                                 // Check if the expiration date has not been reached
154
-                                if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
154
+                                if ($uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date'] == '0000-00-00 00:00:00') {
155 155
                                     return "valid";
156 156
                                 }
157 157
                                 else
@@ -188,15 +188,15 @@  discard block
 block discarded – undo
188 188
 	 * @return mixed System user id if the user was found, WSError otherwise
189 189
 	 */
190 190
 	protected function getUserId($user_id_field_name, $user_id_value) {
191
-		if($user_id_field_name == "chamilo_user_id") {
192
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
191
+		if ($user_id_field_name == "chamilo_user_id") {
192
+			if (UserManager::is_user_id_valid(intval($user_id_value))) {
193 193
 				return intval($user_id_value);
194 194
 			} else {
195 195
 				return new WSCMError(100, "User not found");
196 196
 			}
197 197
 		} else {
198 198
 			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
199
-			if($user_id == 0) {
199
+			if ($user_id == 0) {
200 200
 				return new WSCMError(100, "User not found");
201 201
 			} else {
202 202
 				return $user_id;
@@ -213,8 +213,8 @@  discard block
 block discarded – undo
213 213
 	 * @return mixed System course id if the course was found, WSError otherwise
214 214
 	 */
215 215
 	protected function getCourseId($course_id_field_name, $course_id_value) {
216
-		if($course_id_field_name == "chamilo_course_id") {
217
-			if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
216
+		if ($course_id_field_name == "chamilo_course_id") {
217
+			if (CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
218 218
 				return intval($course_id_value);
219 219
 			} else {
220 220
 				return new WSCMError(200, "Course not found");
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
 	protected function getSessionId($session_id_field_name, $session_id_value)
241 241
 	{
242 242
 		if ($session_id_field_name == "chamilo_session_id") {
243
-			$session = SessionManager::fetch((int)$session_id_value);
244
-			if(!empty($session)) {
243
+			$session = SessionManager::fetch((int) $session_id_value);
244
+			if (!empty($session)) {
245 245
 				return intval($session_id_value);
246 246
 			} else {
247 247
 				return new WSCMError(300, "Session not found");
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 				$session_id_value,
252 252
 				$session_id_field_name
253 253
 			);
254
-			if($session_id == 0) {
254
+			if ($session_id == 0) {
255 255
 				return new WSCMError(300, "Session not found");
256 256
 			} else {
257 257
 				return $session_id;
Please login to merge, or discard this patch.
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -153,18 +153,18 @@
 block discarded – undo
153 153
                                 // Check if the expiration date has not been reached
154 154
                                 if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
155 155
                                     return "valid";
156
+                                } else {
157
+                                                                    return get_lang('AccountExpired');
156 158
                                 }
157
-                                else
158
-                                    return get_lang('AccountExpired');
159
+                            } else {
160
+                                                            return get_lang('AccountInactive');
159 161
                             }
160
-                            else
161
-                                return get_lang('AccountInactive');
162
+                        } else {
163
+                                                    return get_lang('InvalidId');
162 164
                         }
163
-                        else
164
-                            return get_lang('InvalidId');
165
+                    } else {
166
+                                            return get_lang('AccountURLInactive');
165 167
                     }
166
-                    else
167
-                        return get_lang('AccountURLInactive');
168 168
                 }
169 169
                 return get_lang('InvalidId');
170 170
         }
Please login to merge, or discard this patch.
main/webservices/cm_webservice_inbox.php 4 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -204,6 +204,9 @@
 block discarded – undo
204 204
 
205 205
     }
206 206
 
207
+    /**
208
+     * @param integer $user_id
209
+     */
207 210
     protected function set_message_as_read($user_id, $message_id){
208 211
         $table_message = Database::get_main_table(TABLE_MESSAGE);
209 212
         $query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' WHERE user_receiver_id=".$user_id." AND id='".$message_id."';";
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
             $table_message = Database::get_main_table(TABLE_MESSAGE);
38 38
 
39 39
             $sql_query = "SELECT id FROM $table_message " .
40
-                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
41
-                                     " ORDER BY send_date LIMIT $from,$number_of_items";
40
+                                        " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
41
+                                        " ORDER BY send_date LIMIT $from,$number_of_items";
42 42
 
43 43
             $sql_result = Database::query($sql_query);
44 44
             $message = "#";
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
             $table_message = Database::get_main_table(TABLE_MESSAGE);
87 87
 
88 88
             $sql_query = "SELECT ".$field_table." FROM $table_message " .
89
-                                     " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
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);
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
             $table_message = Database::get_main_table(TABLE_MESSAGE);
108 108
 
109 109
             $sql_query = "SELECT id FROM $table_message " .
110
-					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
111
-					 "ORDER BY send_date LIMIT $from,$number_of_items";
110
+                        "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
111
+                        "ORDER BY send_date LIMIT $from,$number_of_items";
112 112
 
113 113
             $sql_result = Database::query($sql_query);
114 114
             $message = "#";
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
             $table_message = Database::get_main_table(TABLE_MESSAGE);
158 158
 
159 159
             $sql_query = "SELECT ".$field_table." FROM $table_message " .
160
-                                     " WHERE user_sender_id=".$user_id." AND id=".$id;
160
+                                        " WHERE user_sender_id=".$user_id." AND id=".$id;
161 161
 
162 162
             $sql_result = Database::query($sql_query);
163 163
             $result = Database::fetch_row($sql_result);
@@ -188,11 +188,11 @@  discard block
 block discarded – undo
188 188
             $table_message = Database::get_main_table(TABLE_MESSAGE);
189 189
 
190 190
             $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
191
-                           " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
191
+                            " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
192 192
             $result = Database::query($query);
193 193
 
194 194
             $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
195
-                           " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
195
+                            " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
196 196
             $result = Database::query($query);
197 197
 
198 198
             $inbox_last_id = Database::insert_id();
Please login to merge, or discard this 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.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 
49 49
             return $message;
50 50
 
51
-        } else
52
-            return get_lang('InvalidId');
51
+        } else {
52
+                    return get_lang('InvalidId');
53
+        }
53 54
 
54 55
     }
55 56
 
@@ -92,8 +93,9 @@  discard block
 block discarded – undo
92 93
             $result = Database::fetch_row($sql_result);
93 94
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
94 95
 
95
-        }else
96
-            return get_lang('InvalidId');
96
+        } else {
97
+                    return get_lang('InvalidId');
98
+        }
97 99
 
98 100
 
99 101
     }
@@ -118,8 +120,9 @@  discard block
 block discarded – undo
118 120
 
119 121
             return $message;
120 122
 
121
-        } else
122
-            return get_lang('InvalidId');
123
+        } else {
124
+                    return get_lang('InvalidId');
125
+        }
123 126
 
124 127
     }
125 128
 
@@ -164,8 +167,9 @@  discard block
 block discarded – undo
164 167
 
165 168
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
166 169
 
167
-        }else
168
-            return get_lang('InvalidId');
170
+        } else {
171
+                    return get_lang('InvalidId');
172
+        }
169 173
 
170 174
 
171 175
     }
@@ -199,8 +203,9 @@  discard block
 block discarded – undo
199 203
 
200 204
             return $inbox_last_id;
201 205
 
202
-        } else
203
-            return get_lang('InvalidId');
206
+        } else {
207
+                    return get_lang('InvalidId');
208
+        }
204 209
 
205 210
     }
206 211
 
Please login to merge, or discard this patch.