Completed
Push — 1.10.x ( 812a9a...914b0e )
by Angel Fernando Quiroz
43:28
created
main/document/exit_pixlr.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,12 +24,12 @@
 block discarded – undo
24 24
 unset($_SESSION['temp_realpath_image']);
25 25
 
26 26
 if (!isset($_SESSION['exit_pixlr'])){
27
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
28
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
29
-	api_not_allowed(true);
27
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php';
28
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
29
+    api_not_allowed(true);
30 30
 } else {
31
-	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
32
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
33
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
34
-	unset($_SESSION['exit_pixlr']);
31
+    echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
32
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
33
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
34
+    unset($_SESSION['exit_pixlr']);
35 35
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -23,13 +23,13 @@
 block discarded – undo
23 23
 unset($_SESSION['whereami']);
24 24
 unset($_SESSION['temp_realpath_image']);
25 25
 
26
-if (!isset($_SESSION['exit_pixlr'])){
27
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
26
+if (!isset($_SESSION['exit_pixlr'])) {
27
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php';
28 28
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
29 29
 	api_not_allowed(true);
30 30
 } else {
31 31
 	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
32
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
32
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
33 33
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
34 34
 	unset($_SESSION['exit_pixlr']);
35 35
 }
Please login to merge, or discard this patch.
main/document/remote.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
15 15
 /* FIX for IE cache when using https */
16 16
 session_cache_limiter('none');
17 17
 /*==== DEBUG ====*/
18
-$debug=0;
19
-if ($debug>0) {
18
+$debug = 0;
19
+if ($debug > 0) {
20 20
     // dump the request
21 21
     $v = array_keys(get_defined_vars());
22
-    error_log(var_export($v, true),3, '/tmp/log');
22
+    error_log(var_export($v, true), 3, '/tmp/log');
23 23
     foreach (array_keys(get_defined_vars()) as $k) {
24 24
         if ($k == 'GLOBALS') {
25 25
             continue;
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 api_block_anonymous_users();
34 34
 /*==== Variables initialisation ====*/
35 35
 $action = $_REQUEST['action']; //safe as only used in if()'s
36
-$seek = array('/','%2F','..');
37
-$destroy = array('','','');
38
-$cidReq = str_replace($seek,$destroy,$_REQUEST["cidReq"]);
36
+$seek = array('/', '%2F', '..');
37
+$destroy = array('', '', '');
38
+$cidReq = str_replace($seek, $destroy, $_REQUEST["cidReq"]);
39 39
 $cidReq = Security::remove_XSS($cidReq);
40 40
 $user_id = api_get_user_id();
41 41
 $coursePath = api_get_path(SYS_COURSE_PATH).$cidReq.'/document';
@@ -44,27 +44,27 @@  discard block
 block discarded – undo
44 44
 // stupid variable initialisation for old version of DocumentManager functions.
45 45
 $_course['path'] = $_course['directory'];
46 46
 $is_manager = (CourseManager::get_user_in_course_status($user_id, $cidReq) == COURSEMANAGER);
47
-if ($debug>0) { error_log($coursePath, 0); }
47
+if ($debug > 0) { error_log($coursePath, 0); }
48 48
 // FIXME: check security around $_REQUEST["cwd"]
49 49
 $cwd = $_REQUEST['cwd'];
50 50
 // treat /..
51 51
 $nParent = 0; // the number of /.. into the url
52 52
 while (substr($cwd, -3, 3) == '/..') {
53 53
     // go to parent directory
54
-    $cwd= substr($cwd, 0, -3);
55
-    if (strlen($cwd) == 0) { $cwd='/'; }
54
+    $cwd = substr($cwd, 0, -3);
55
+    if (strlen($cwd) == 0) { $cwd = '/'; }
56 56
     $nParent++;
57 57
 }
58
-for (;$nParent >0; $nParent--) {
59
-    $cwd = (strrpos($cwd,'/')>-1 ? substr($cwd, 0, strrpos($cwd,'/')) : $cwd);
58
+for (;$nParent > 0; $nParent--) {
59
+    $cwd = (strrpos($cwd, '/') > -1 ? substr($cwd, 0, strrpos($cwd, '/')) : $cwd);
60 60
 }
61
-if (strlen($cwd) == 0) { $cwd='/'; }
62
-if (Security::check_abs_path($cwd,api_get_path(SYS_PATH))) {
61
+if (strlen($cwd) == 0) { $cwd = '/'; }
62
+if (Security::check_abs_path($cwd, api_get_path(SYS_PATH))) {
63 63
     die();
64 64
 }
65 65
 if ($action == 'list') {
66 66
     /*==== List files ====*/
67
-    if ($debug>0) { error_log("sending file list",0); }
67
+    if ($debug > 0) { error_log("sending file list", 0); }
68 68
 
69 69
     // get files list
70 70
     $files = DocumentManager::get_all_document_data($_course, $cwd, 0, NULL, false);
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,9 @@
 block discarded – undo
40 40
 $user_id = api_get_user_id();
41 41
 $coursePath = api_get_path(SYS_COURSE_PATH).$cidReq.'/document';
42 42
 $_course = CourseManager::get_course_information($cidReq);
43
-if ($_course == null) die ("problem when fetching course information");
43
+if ($_course == null) {
44
+    die ("problem when fetching course information");
45
+}
44 46
 // stupid variable initialisation for old version of DocumentManager functions.
45 47
 $_course['path'] = $_course['directory'];
46 48
 $is_manager = (CourseManager::get_user_in_course_status($user_id, $cidReq) == COURSEMANAGER);
Please login to merge, or discard this patch.
main/document/slideshow.inc.php 2 patches
Indentation   +11 added lines, -13 removed lines patch added patch discarded remove patch
@@ -15,8 +15,6 @@  discard block
 block discarded – undo
15 15
 	This file has two large sections.
16 16
 	1. code that belongs in document.php, but to avoid clutter I put the code here
17 17
 	2. the function resize_image that handles the image resizing
18
-
19
-
20 18
  *	@author Patrick Cool
21 19
  *	@package chamilo.document
22 20
  *	@todo convert comments to be understandable to phpDocumentor
@@ -34,16 +32,16 @@  discard block
 block discarded – undo
34 32
  *							view is also possible when you choose not to resize the source images
35 33
  */
36 34
 function resize_image($image, $target_width, $target_height, $slideshow = 0) {
37
-	// Modifications by Ivan Tcholakov, 04-MAY-2009.
38
-	$result = array();
39
-	if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
40
-		$new_sizes = api_resize_image($image, $target_width, $target_height);
41
-		$result[] = $new_sizes['height'];
42
-		$result[] = $new_sizes['width'];
43
-	} else {		
35
+    // Modifications by Ivan Tcholakov, 04-MAY-2009.
36
+    $result = array();
37
+    if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
38
+        $new_sizes = api_resize_image($image, $target_width, $target_height);
39
+        $result[] = $new_sizes['height'];
40
+        $result[] = $new_sizes['width'];
41
+    } else {		
44 42
         $size = api_getimagesize($image);
45
-		$result[] = $size['height'];
46
-		$result[] = $size['width'];
47
-	}
48
-	return $result;
43
+        $result[] = $size['height'];
44
+        $result[] = $size['width'];
45
+    }
46
+    return $result;
49 47
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 function resize_image($image, $target_width, $target_height, $slideshow = 0) {
37 37
 	// Modifications by Ivan Tcholakov, 04-MAY-2009.
38 38
 	$result = array();
39
-	if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
39
+	if ((isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') or $slideshow == 1) {
40 40
 		$new_sizes = api_resize_image($image, $target_width, $target_height);
41 41
 		$result[] = $new_sizes['height'];
42 42
 		$result[] = $new_sizes['width'];
Please login to merge, or discard this patch.
main/document/showinframes.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
         );
149 149
     }
150 150
 } else {
151
-    foreach($document_data['parents'] as $document_sub_data) {
152
-        if (!isset($_GET['createdir']) && $document_sub_data['id'] ==  $document_data['id']) {
151
+    foreach ($document_data['parents'] as $document_sub_data) {
152
+        if (!isset($_GET['createdir']) && $document_sub_data['id'] == $document_data['id']) {
153 153
             $document_sub_data['document_url'] = '#';
154 154
         }
155 155
         $interbreadcrumb[] = array(
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 }
180 180
 $js_glossary_in_documents = '';
181 181
 
182
-$js_glossary_in_documents =	'
182
+$js_glossary_in_documents = '
183 183
   $.frameReady(function(){
184 184
    //  $("<div>I am a div courses</div>").prependTo("body");
185 185
   }, "top.mainFrame",
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 // PDF should be displayed with viewerJS
200 200
 $web_odf_supported_files[] = 'pdf';
201 201
 if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) {
202
-    $show_web_odf  = true;
202
+    $show_web_odf = true;
203 203
     /*
204 204
     $htmlHeadXtra[] = api_get_js('webodf/webodf.js');
205 205
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/webodf/webodf.css');
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
     $htmlHeadXtra[] = api_get_js('highlight/highlight.pack.js');
243 243
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'chat.css');
244 244
     $htmlHeadXtra[] = api_get_css(
245
-        api_get_path(WEB_LIBRARY_PATH) . 'javascript/highlight/styles/github.css'
245
+        api_get_path(WEB_LIBRARY_PATH).'javascript/highlight/styles/github.css'
246 246
     );
247 247
     $htmlHeadXtra[] = '
248 248
     <script>
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 $execute_iframe = true;
254 254
 if ($jplayer_supported) {
255 255
     $extension = api_strtolower($pathinfo['extension']);
256
-    if ($extension == 'mp4')  {
256
+    if ($extension == 'mp4') {
257 257
         $extension = 'm4v';
258 258
     }
259 259
     $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
@@ -294,12 +294,12 @@  discard block
 block discarded – undo
294 294
     $execute_iframe = false;
295 295
 }
296 296
 
297
-$is_freemind_available = $pathinfo['extension']=='mm' && api_get_setting('enable_freemind') == 'true';
297
+$is_freemind_available = $pathinfo['extension'] == 'mm' && api_get_setting('enable_freemind') == 'true';
298 298
 if ($is_freemind_available) {
299 299
     $execute_iframe = false;
300 300
 }
301 301
 
302
-$is_nanogong_available = $pathinfo['extension']=='wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true';
302
+$is_nanogong_available = $pathinfo['extension'] == 'wav' && preg_match('/_chnano_.wav/i', $file_url_web) && api_get_setting('enable_nanogong') == 'true';
303 303
 if ($is_nanogong_available) {
304 304
     $execute_iframe = false;
305 305
 }
@@ -339,20 +339,20 @@  discard block
 block discarded – undo
339 339
 $file_url_web = $file_url.'?'.api_get_cidreq();
340 340
 
341 341
 if (!$is_nanogong_available) {
342
-    if (in_array(strtolower($pathinfo['extension']) , array('html', "htm"))) {
342
+    if (in_array(strtolower($pathinfo['extension']), array('html', "htm"))) {
343 343
         echo '<a class="btn btn-default" href="'.$file_url_web.'" target="_blank">'.get_lang('CutPasteLink').'</a>';
344 344
     }
345 345
 }
346 346
 
347 347
 if ($show_web_odf) {
348 348
     $browser = api_get_navigator();
349
-    $pdfUrl = api_get_path(WEB_LIBRARY_PATH) . 'javascript/ViewerJS/index.html#' . $file_url;
349
+    $pdfUrl = api_get_path(WEB_LIBRARY_PATH).'javascript/ViewerJS/index.html#'.$file_url;
350 350
     if ($browser['name'] == 'Mozilla' && preg_match('|.*\.pdf|i', $header_file)) {
351 351
         $pdfUrl = $file_url;
352 352
     }
353 353
     echo '<div id="viewerJS">';
354 354
     echo '<iframe id="viewerJSContent" frameborder="0" allowfullscreen="allowfullscreen" webkitallowfullscreen style="width:100%;"
355
-            src="' . $pdfUrl. '">
355
+            src="' . $pdfUrl.'">
356 356
         </iframe>';
357 357
     echo '</div>';
358 358
 } else {
Please login to merge, or discard this patch.
main/document/document_quota.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 $session = array();
33 33
 $user_name = $user_info['complete_name'];
34 34
 
35
-$course_list = SessionManager::get_course_list_by_session_id ($session_id);
35
+$course_list = SessionManager::get_course_list_by_session_id($session_id);
36 36
 $session_list = SessionManager::get_session_by_course($course_id);
37 37
 $total_quota_bytes = DocumentManager::get_course_quota();
38
-$quota_bytes = DocumentManager::documents_total_space($course_id, 0 , 0);
39
-$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
38
+$quota_bytes = DocumentManager::documents_total_space($course_id, 0, 0);
39
+$quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
40 40
 
41 41
 $session[] = array(get_lang('Course').' ('.format_file_size($quota_bytes).')', $quota_percentage);
42 42
 
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
     foreach ($session_list as $session_data) {
47 47
         $quota_percentage = 0;
48 48
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, null, $session_data['id']));
49
-        if (!empty($quota_bytes))  {
50
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
49
+        if (!empty($quota_bytes)) {
50
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
51 51
         }
52 52
         if ($session_id == $session_data['id']) {
53
-            $session_data['name'] = $session_data['name'] . ' * ';
53
+            $session_data['name'] = $session_data['name'].' * ';
54 54
         }
55 55
         $used_quota_bytes += $quota_bytes;
56 56
         $session[] = array(
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
66 66
         $quota_percentage = 0;
67 67
         $my_group_id = $group_data['id'];
68 68
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, $my_group_id, 0));
69
-        if (!empty($quota_bytes))  {
70
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
69
+        if (!empty($quota_bytes)) {
70
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
71 71
         }
72 72
         if ($group_id == $my_group_id) {
73
-            $group_data['name'] = $group_data['name'] . ' * ';
73
+            $group_data['name'] = $group_data['name'].' * ';
74 74
         }
75 75
         $used_quota_bytes += $quota_bytes;
76 76
         $session[] = array(addslashes(get_lang('Group').': '.$group_data['name']).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         }
86 86
     }
87 87
     if ($quota_bytes != 0) {
88
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
88
+       $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
89 89
     }
90 90
 
91 91
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
                 $total_quota_bytes += DocumentManager::get_course_quota($course_data['id']);
99 99
             }
100 100
             if ($quota_bytes != 0) {
101
-                $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
101
+                $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
102 102
             }
103 103
         }
104
-        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
104
+        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'), $user_name)), $quota_percentage);
105 105
 
106 106
    }
107 107
 }
108 108
 
109
-$quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;
109
+$quota_percentage = round(($total_quota_bytes - $used_quota_bytes) / $total_quota_bytes, 2) * 100;
110 110
 $session[] = array(addslashes(get_lang('ShowCourseQuotaUse')).' ('.format_file_size($total_quota_bytes - $used_quota_bytes).') ', $quota_percentage);
111 111
 $quota_data = json_encode($session);
112 112
 
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         }
86 86
     }
87 87
     if ($quota_bytes != 0) {
88
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
88
+        $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
89 89
     }
90 90
 
91 91
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
         }
104 104
         $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
105 105
 
106
-   }
106
+    }
107 107
 }
108 108
 
109 109
 $quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;
Please login to merge, or discard this patch.
main/resourcelinker/resourcelinker.php 3 patches
Indentation   +462 added lines, -462 removed lines patch added patch discarded remove patch
@@ -79,81 +79,81 @@  discard block
 block discarded – undo
79 79
 */
80 80
 if ($from_learnpath == 'yes')
81 81
 {
82
-	//start from clear every time in LearnPath Builder
83
-	$_SESSION['addedresource'] = null;
84
-	$_SESSION['addedresourceid'] = null;
85
-	$_SESSION['addedresourceassigned'] = null;
86
-	unset ($_SESSION['addedresource']);
87
-	unset ($_SESSION['addedresourceid']);
88
-	unset ($_SESSION['addedresourceassigned']);
82
+    //start from clear every time in LearnPath Builder
83
+    $_SESSION['addedresource'] = null;
84
+    $_SESSION['addedresourceid'] = null;
85
+    $_SESSION['addedresourceassigned'] = null;
86
+    unset ($_SESSION['addedresource']);
87
+    unset ($_SESSION['addedresourceid']);
88
+    unset ($_SESSION['addedresourceassigned']);
89 89
 }
90 90
 
91 91
 // Process a new chapter?
92 92
 if (!empty ($_POST['add_chapter']) && !empty ($_POST['title']))
93 93
 {
94
-	$title = $_POST['title'];
95
-	$description = '';
96
-	if (!empty ($_POST['description']))
97
-	{
98
-		$description = $_POST['description'];
99
-	}
100
-
101
-	// get max display_order so far in this parent chapter
102
-	$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE learnpath_id = $learnpath_id "." AND parent_chapter_id = $chapter_id";
103
-	$res = Database::query($sql);
104
-	$row = Database::fetch_array($res);
105
-	$max_temp = $row[0];
106
-
107
-	$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE "." chapter_id = $chapter_id";
108
-	$res = Database::query($sql);
109
-	$row = Database::fetch_array($res);
110
-	$max_temp2 = $row[0];
111
-	if ($max_temp2 > $max_temp)
112
-	{
113
-		$order = $max_temp2 +1;
114
-	}
115
-	else
116
-	{
117
-		$order = $max_temp +1;
118
-	}
119
-
120
-	$sql = "INSERT INTO $tbl_learnpath_chapter "."(learnpath_id,chapter_name,chapter_description,parent_chapter_id,display_order) "." VALUES "."($learnpath_id, '$title', '$description', $chapter_id, $order )";
121
-	$res = Database::query($sql);
122
-	if ($res !== false)
123
-	{
124
-		$title = '';
125
-		$description = '';
126
-	}
94
+    $title = $_POST['title'];
95
+    $description = '';
96
+    if (!empty ($_POST['description']))
97
+    {
98
+        $description = $_POST['description'];
99
+    }
100
+
101
+    // get max display_order so far in this parent chapter
102
+    $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE learnpath_id = $learnpath_id "." AND parent_chapter_id = $chapter_id";
103
+    $res = Database::query($sql);
104
+    $row = Database::fetch_array($res);
105
+    $max_temp = $row[0];
106
+
107
+    $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE "." chapter_id = $chapter_id";
108
+    $res = Database::query($sql);
109
+    $row = Database::fetch_array($res);
110
+    $max_temp2 = $row[0];
111
+    if ($max_temp2 > $max_temp)
112
+    {
113
+        $order = $max_temp2 +1;
114
+    }
115
+    else
116
+    {
117
+        $order = $max_temp +1;
118
+    }
119
+
120
+    $sql = "INSERT INTO $tbl_learnpath_chapter "."(learnpath_id,chapter_name,chapter_description,parent_chapter_id,display_order) "." VALUES "."($learnpath_id, '$title', '$description', $chapter_id, $order )";
121
+    $res = Database::query($sql);
122
+    if ($res !== false)
123
+    {
124
+        $title = '';
125
+        $description = '';
126
+    }
127 127
 }
128 128
 
129 129
 // This if when a external link is submitted
130 130
 if (!empty ($_POST['external_link_submit']))
131 131
 {
132
-	$add = true;
133
-	if ($add_2_links != "niet toevoegen")
134
-	{
135
-		// add external link to the links table.
136
-		$pos = strpos($external_link, 'ttp:');
137
-		if ($pos == '')
138
-		{
139
-			$external_link = 'http://'.$external_link;
140
-		}
141
-
142
-		$sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
143
-		$result = Database::query($sql);
144
-		$addedresource[] = "Link";
145
-		$addedresourceid[] = Database::insert_id();
146
-		$_SESSION['addedresource'] = $addedresource;
147
-		$_SESSION['addedresourceid'] = $addedresourceid;
148
-	}
149
-	else
150
-	{
151
-		// do not add external link to the links table
152
-		$addedresource[] = "Externallink";
153
-		$addedresourceid[] = $external_link;
154
-		$_SESSION['addedresource'] = $addedresource;
155
-		$_SESSION['addedresourceid'] = $addedresourceid;
156
-	}
132
+    $add = true;
133
+    if ($add_2_links != "niet toevoegen")
134
+    {
135
+        // add external link to the links table.
136
+        $pos = strpos($external_link, 'ttp:');
137
+        if ($pos == '')
138
+        {
139
+            $external_link = 'http://'.$external_link;
140
+        }
141
+
142
+        $sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
143
+        $result = Database::query($sql);
144
+        $addedresource[] = "Link";
145
+        $addedresourceid[] = Database::insert_id();
146
+        $_SESSION['addedresource'] = $addedresource;
147
+        $_SESSION['addedresourceid'] = $addedresourceid;
148
+    }
149
+    else
150
+    {
151
+        // do not add external link to the links table
152
+        $addedresource[] = "Externallink";
153
+        $addedresourceid[] = $external_link;
154
+        $_SESSION['addedresource'] = $addedresource;
155
+        $_SESSION['addedresourceid'] = $addedresourceid;
156
+    }
157 157
 }
158 158
 
159 159
 // loading the session variables into local array
@@ -163,107 +163,107 @@  discard block
 block discarded – undo
163 163
 // This is when a resource was added to the session
164 164
 if ($add)
165 165
 {
166
-	// adding the new variable to the local array
167
-	if (empty ($_POST['external_link_submit']))
168
-	{
169
-		//that case is already arranged, see upwards
170
-		$addedresource[] = $content;
171
-		$addedresourceid[] = $add;
172
-	}
173
-	$addedresourceassigned[] = 0;
174
-
175
-	// loading the local array into the session variable
176
-	$_SESSION['addedresource'] = $addedresource;
177
-	$_SESSION['addedresourceid'] = $addedresourceid;
166
+    // adding the new variable to the local array
167
+    if (empty ($_POST['external_link_submit']))
168
+    {
169
+        //that case is already arranged, see upwards
170
+        $addedresource[] = $content;
171
+        $addedresourceid[] = $add;
172
+    }
173
+    $addedresourceassigned[] = 0;
174
+
175
+    // loading the local array into the session variable
176
+    $_SESSION['addedresource'] = $addedresource;
177
+    $_SESSION['addedresourceid'] = $addedresourceid;
178
+
179
+    //---------------------------------------
180
+    //we assign to chapters immediately !
181
+    //---------------------------------------
182
+    $resource_added = false;
183
+    if ($from_learnpath == 'yes')
184
+    {
185
+        $i = 0;
186
+        //calculating the last order of the items of this chapter
187
+        $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE chapter_id=$chapter_id";
188
+        $result = Database::query($sql);
189
+        if(Database::num_rows($result)==0){
190
+            $lastorder_item = 0;
191
+        }else{
192
+            $row = Database::fetch_array($result);
193
+            $lastorder_item = ($row[0]);
194
+        }
195
+        $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
196
+        $result = Database::query($sql);
197
+        if(Database::num_rows($result)==0){
198
+            $lastorder_chapter = 0;
199
+        }else{
200
+            $row = Database::fetch_array($result);
201
+            $lastorder_chapter = ($row[0]);
202
+        }
203
+        $lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
178 204
 
179
-	//---------------------------------------
180
-	//we assign to chapters immediately !
181
-	//---------------------------------------
182
-	$resource_added = false;
183
-	if ($from_learnpath == 'yes')
184
-	{
185
-		$i = 0;
186
-		//calculating the last order of the items of this chapter
187
-		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE chapter_id=$chapter_id";
188
-		$result = Database::query($sql);
189
-		if(Database::num_rows($result)==0){
190
-			$lastorder_item = 0;
191
-		}else{
192
-			$row = Database::fetch_array($result);
193
-			$lastorder_item = ($row[0]);
194
-		}
195
-		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
196
-		$result = Database::query($sql);
197
-		if(Database::num_rows($result)==0){
198
-			$lastorder_chapter = 0;
199
-		}else{
200
-			$row = Database::fetch_array($result);
201
-			$lastorder_chapter = ($row[0]);
202
-		}
203
-		$lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
204
-
205
-		foreach ($addedresource as $addedresource_item)
206
-		{
207
-			// in the case we added a chapter, add this into the chapters list with the correct parent_id
208
-			if ($addedresource_item == "Chap")
209
-			{
210
-				$sql = "INSERT INTO $tbl_learnpath_chapter ("."'learnpath_id','chapter_name','chapter_description','parent_chapter_id','display_order'".") VALUES (".$learnpath_id.",'".$learnpath_chapter_name."','".$learnpath_chapter_description."',".$chapter_id.",".$lastorder.")";
211
-				Database::query($sql);
212
-			}
213
-
214
-			if (!$addedresourceassigned[$i])
215
-			{
216
-				//not to assign it twice
217
-				if ($addedresource_item == "Ass")
218
-				{
219
-					$addedresource_item = "Assignments";
220
-				}
221
-				if ($addedresource_item == "Drop")
222
-				{
223
-					$addedresource_item = "Dropbox";
224
-				}
225
-				if ($addedresource_item == "Intro")
226
-				{
227
-					$addedresource_item = "Introduction_text";
228
-				}
229
-				if ($addedresource_item == "Course_desc")
230
-				{
231
-					$addedresource_item = "Course_description";
232
-				}
233
-				if ($addedresource_item == "Group")
234
-				{
235
-					$addedresource_item = "Groups";
236
-				}
237
-				if ($addedresource_item == "User")
238
-				{
239
-					$addedresource_item = "Users";
240
-				}
241
-				if ($target == '')
242
-				{
243
-					$target = '_self';
244
-				}
245
-				if ($addedresource_item == 'Link')
246
-				{
247
-					$addedresource_item .= ' '.$target;
248
-				}
249
-				$sql = "INSERT INTO $tbl_learnpath_item (id, chapter_id, item_type, item_id, display_order) VALUES ( '$autoid', '$chapter_id', '$addedresource_item','$addedresourceid[$i]','".$lastorder."')";
250
-				$result = Database::query($sql);
251
-				$addedresourceassigned[$i] = 1;
252
-				$resource_added = true;
253
-			}
254
-			$i ++;
255
-			$lastorder ++;
256
-		}
257
-		//$_SESSION['addedresource']=null;
258
-		//$_SESSION['addedresourceid']=null;
259
-		// cleaning up the session once again
260
-		$_SESSION['addedresource'] = null;
261
-   		$_SESSION['addedresourceid'] = null;
262
-   		$_SESSION['addedresourceassigned'] = null;
263
-   		unset ($_SESSION['addedresource']);
264
-   		unset ($_SESSION['addedresourceid']);
265
-   		unset ($_SESSION['addedresourceassigned']);
266
-	}
205
+        foreach ($addedresource as $addedresource_item)
206
+        {
207
+            // in the case we added a chapter, add this into the chapters list with the correct parent_id
208
+            if ($addedresource_item == "Chap")
209
+            {
210
+                $sql = "INSERT INTO $tbl_learnpath_chapter ("."'learnpath_id','chapter_name','chapter_description','parent_chapter_id','display_order'".") VALUES (".$learnpath_id.",'".$learnpath_chapter_name."','".$learnpath_chapter_description."',".$chapter_id.",".$lastorder.")";
211
+                Database::query($sql);
212
+            }
213
+
214
+            if (!$addedresourceassigned[$i])
215
+            {
216
+                //not to assign it twice
217
+                if ($addedresource_item == "Ass")
218
+                {
219
+                    $addedresource_item = "Assignments";
220
+                }
221
+                if ($addedresource_item == "Drop")
222
+                {
223
+                    $addedresource_item = "Dropbox";
224
+                }
225
+                if ($addedresource_item == "Intro")
226
+                {
227
+                    $addedresource_item = "Introduction_text";
228
+                }
229
+                if ($addedresource_item == "Course_desc")
230
+                {
231
+                    $addedresource_item = "Course_description";
232
+                }
233
+                if ($addedresource_item == "Group")
234
+                {
235
+                    $addedresource_item = "Groups";
236
+                }
237
+                if ($addedresource_item == "User")
238
+                {
239
+                    $addedresource_item = "Users";
240
+                }
241
+                if ($target == '')
242
+                {
243
+                    $target = '_self';
244
+                }
245
+                if ($addedresource_item == 'Link')
246
+                {
247
+                    $addedresource_item .= ' '.$target;
248
+                }
249
+                $sql = "INSERT INTO $tbl_learnpath_item (id, chapter_id, item_type, item_id, display_order) VALUES ( '$autoid', '$chapter_id', '$addedresource_item','$addedresourceid[$i]','".$lastorder."')";
250
+                $result = Database::query($sql);
251
+                $addedresourceassigned[$i] = 1;
252
+                $resource_added = true;
253
+            }
254
+            $i ++;
255
+            $lastorder ++;
256
+        }
257
+        //$_SESSION['addedresource']=null;
258
+        //$_SESSION['addedresourceid']=null;
259
+        // cleaning up the session once again
260
+        $_SESSION['addedresource'] = null;
261
+            $_SESSION['addedresourceid'] = null;
262
+            $_SESSION['addedresourceassigned'] = null;
263
+            unset ($_SESSION['addedresource']);
264
+            unset ($_SESSION['addedresourceid']);
265
+            unset ($_SESSION['addedresourceassigned']);
266
+    }
267 267
 }
268 268
 
269 269
 /*
@@ -278,64 +278,64 @@  discard block
 block discarded – undo
278 278
 */
279 279
 if ($_GET["source_id"])
280 280
 {
281
-	switch ($_GET["source_id"])
282
-	{
283
-		case "1" : // coming from Agenda
284
-			if ($action == "edit")
285
-			{
286
-				$url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
287
-			}
288
-			elseif ($action == "add")
289
-		{
290
-				$url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
291
-			}
292
-			else
293
-			{
294
-				$url = "../calendar/agenda.php?action=add";
295
-			}
296
-			$originaltoolname = get_lang("Agenda");
297
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
298
-			session_unregister('from_learnpath');
299
-			unset ($from_learnpath);
300
-			break;
301
-		case "2" : // coming from forum: new topic
302
-			$url = "../phpbb/newtopic.php?forum=$source_forum&md5=$md5";
303
-			$originaltoolname = get_lang("ForumAddNewTopic");
304
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
305
-			session_unregister('from_learnpath');
306
-			unset ($from_learnpath);
307
-			break;
308
-		case "3" : // coming from forum: edit topic
309
-			$url = "../phpbb/editpost.php?post_id=$post_id&topic=$topic&forum=$forum&md5=$md5&originalresource=no";
310
-			$originaltoolname = get_lang("ForumEditTopic");
311
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
312
-			session_unregister('from_learnpath');
313
-			unset ($from_learnpath);
314
-			break;
315
-		case "4" : // coming from exercises: edit topic
316
-			$url = "../exercice/admin.php?modifyAnswers=$modifyAnswers";
317
-			$originaltoolname = get_lang("ExerciseAnswers");
318
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
319
-			session_unregister('from_learnpath');
320
-			unset ($from_learnpath);
321
-			break;
322
-		case "5" : // coming from learning path
323
-			$from_learnpath = 'yes';
324
-			Session::write('from_learnpath',$from_learnpath);
325
-			break;
326
-			/*************************************** end add [email protected] *********************************/
327
-
328
-	}
329
-	// We do not come from the learning path. We store the name of the tool & url in a session.
330
-	if ($from_learnpath != 'yes')
331
-	{
332
-		if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"]<>$interbreadcrumb["url"])
333
-		{
334
-			$_SESSION["origintoolurl"] = $breadcrumbelement["url"];
335
-			$_SESSION["origintoolname"] = $breadcrumbelement["name"];
336
-			$interbreadcrumb = "";
337
-		}
338
-	}
281
+    switch ($_GET["source_id"])
282
+    {
283
+        case "1" : // coming from Agenda
284
+            if ($action == "edit")
285
+            {
286
+                $url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
287
+            }
288
+            elseif ($action == "add")
289
+        {
290
+                $url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
291
+            }
292
+            else
293
+            {
294
+                $url = "../calendar/agenda.php?action=add";
295
+            }
296
+            $originaltoolname = get_lang("Agenda");
297
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
298
+            session_unregister('from_learnpath');
299
+            unset ($from_learnpath);
300
+            break;
301
+        case "2" : // coming from forum: new topic
302
+            $url = "../phpbb/newtopic.php?forum=$source_forum&md5=$md5";
303
+            $originaltoolname = get_lang("ForumAddNewTopic");
304
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
305
+            session_unregister('from_learnpath');
306
+            unset ($from_learnpath);
307
+            break;
308
+        case "3" : // coming from forum: edit topic
309
+            $url = "../phpbb/editpost.php?post_id=$post_id&topic=$topic&forum=$forum&md5=$md5&originalresource=no";
310
+            $originaltoolname = get_lang("ForumEditTopic");
311
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
312
+            session_unregister('from_learnpath');
313
+            unset ($from_learnpath);
314
+            break;
315
+        case "4" : // coming from exercises: edit topic
316
+            $url = "../exercice/admin.php?modifyAnswers=$modifyAnswers";
317
+            $originaltoolname = get_lang("ExerciseAnswers");
318
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
319
+            session_unregister('from_learnpath');
320
+            unset ($from_learnpath);
321
+            break;
322
+        case "5" : // coming from learning path
323
+            $from_learnpath = 'yes';
324
+            Session::write('from_learnpath',$from_learnpath);
325
+            break;
326
+            /*************************************** end add [email protected] *********************************/
327
+
328
+    }
329
+    // We do not come from the learning path. We store the name of the tool & url in a session.
330
+    if ($from_learnpath != 'yes')
331
+    {
332
+        if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"]<>$interbreadcrumb["url"])
333
+        {
334
+            $_SESSION["origintoolurl"] = $breadcrumbelement["url"];
335
+            $_SESSION["origintoolname"] = $breadcrumbelement["name"];
336
+            $interbreadcrumb = "";
337
+        }
338
+    }
339 339
 
340 340
 }
341 341
 
@@ -343,26 +343,26 @@  discard block
 block discarded – undo
343 343
 // the information from the session. Else we use the information of the learningpath itself.
344 344
 if ($from_learnpath != 'yes')
345 345
 {
346
-	$nameTools = get_lang('AddResource');
347
-	$interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
346
+    $nameTools = get_lang('AddResource');
347
+    $interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
348 348
 }
349 349
 else
350 350
 {
351
-	$learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
351
+    $learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
352 352
 		  								WHERE learnpath_id=$learnpath_id";
353
-	$sql_result = Database::query($learnpath_select_query);
354
-	$therow = Database::fetch_array($sql_result);
353
+    $sql_result = Database::query($learnpath_select_query);
354
+    $therow = Database::fetch_array($sql_result);
355 355
 
356
-	$learnpath_chapter_query = "	SELECT * FROM $tbl_learnpath_chapter
356
+    $learnpath_chapter_query = "	SELECT * FROM $tbl_learnpath_chapter
357 357
 		  								WHERE (learnpath_id = '$learnpath_id' and id = '$chapter_id')";
358
-	$sql_result = Database::query($learnpath_chapter_query);
359
-	$therow2 = Database::fetch_array($sql_result);
358
+    $sql_result = Database::query($learnpath_chapter_query);
359
+    $therow2 = Database::fetch_array($sql_result);
360 360
 
361
-	$from_learnpath = 'yes';
362
-	session_register('from_learnpath');
363
-	$interbreadcrumb[] = array ("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
364
-	$interbreadcrumb[] = array ("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
365
-	$interbreadcrumb[] = array ("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
361
+    $from_learnpath = 'yes';
362
+    session_register('from_learnpath');
363
+    $interbreadcrumb[] = array ("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
364
+    $interbreadcrumb[] = array ("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
365
+    $interbreadcrumb[] = array ("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
366 366
 
367 367
 }
368 368
 
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 echo "<h3>".$nameTools;
381 381
 if ($from_learnpath == 'yes')
382 382
 {
383
-	echo get_lang("AddResource")." - {$therow2['chapter_name']}";
383
+    echo get_lang("AddResource")." - {$therow2['chapter_name']}";
384 384
 }
385 385
 echo "</h3>";
386 386
 
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 $result_select_active=Database::query($sql_select_active);
394 394
 while ($row=Database::fetch_array($result_select_active))
395 395
 {
396
-	$active_modules[]=$row['name'];
396
+    $active_modules[]=$row['name'];
397 397
 }
398 398
 
399 399
 
@@ -536,12 +536,12 @@  discard block
 block discarded – undo
536 536
 
537 537
 if ($from_learnpath != 'yes')
538 538
 {
539
-	echo "<tr><td>&nbsp;</td></tr>";
540
-	echo "<tr><td><b>".get_lang('ResourcesAdded')." (";
541
-	echo count($addedresource);
542
-	echo ")</b></td></tr>";
543
-	echo "<tr><td nowrap><a href=\"".api_get_self()."?showresources=true&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('ShowDelete')."</a>";
544
-	echo "</td></tr>";
539
+    echo "<tr><td>&nbsp;</td></tr>";
540
+    echo "<tr><td><b>".get_lang('ResourcesAdded')." (";
541
+    echo count($addedresource);
542
+    echo ")</b></td></tr>";
543
+    echo "<tr><td nowrap><a href=\"".api_get_self()."?showresources=true&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('ShowDelete')."</a>";
544
+    echo "</td></tr>";
545 545
 }
546 546
 ?>
547 547
         <tr>
@@ -557,11 +557,11 @@  discard block
 block discarded – undo
557 557
 
558 558
 if ($from_learnpath != 'yes')
559 559
 {
560
-	echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
560
+    echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
561 561
 }
562 562
 else
563 563
 {
564
-	echo "<form method=\"get\" action=\"../learnpath/learnpath_handler.php\" style=\"margin: 0px;\"><input type=\"hidden\" name=\"learnpath_id\" value=\"".htmlentities($learnpath_id)."\"><input type=\"submit\" value=\"".'  '.get_lang('Ok').'  '."\"></form>";
564
+    echo "<form method=\"get\" action=\"../learnpath/learnpath_handler.php\" style=\"margin: 0px;\"><input type=\"hidden\" name=\"learnpath_id\" value=\"".htmlentities($learnpath_id)."\"><input type=\"submit\" value=\"".'  '.get_lang('Ok').'  '."\"></form>";
565 565
 }
566 566
 ?>
567 567
 
@@ -577,40 +577,40 @@  discard block
 block discarded – undo
577 577
 
578 578
 if ($resource_added)
579 579
 {
580
-	Display :: display_normal_message(get_lang("ResourceAdded"));
580
+    Display :: display_normal_message(get_lang("ResourceAdded"));
581 581
 }
582 582
 
583 583
 if ($from_learnpath != 'yes')
584 584
 {
585
-	echo count($addedresource)." ".api_strtolower(get_lang('ResourcesAdded'))."<br/>";
585
+    echo count($addedresource)." ".api_strtolower(get_lang('ResourcesAdded'))."<br/>";
586 586
 }
587 587
 //echo "<hr>";
588 588
 
589 589
 // Agenda items -->
590 590
 if ($content == "Agenda")
591 591
 {
592
-	$TABLEAGENDA 			= Database::get_course_table(TABLE_AGENDA);
593
-	$TABLE_ITEM_PROPERTY 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
592
+    $TABLEAGENDA 			= Database::get_course_table(TABLE_AGENDA);
593
+    $TABLE_ITEM_PROPERTY 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
594 594
 
595
-	$sql="SELECT agenda.*, toolitemproperties.*
595
+    $sql="SELECT agenda.*, toolitemproperties.*
596 596
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." toolitemproperties
597 597
 					WHERE agenda.id = toolitemproperties.ref
598 598
 					AND toolitemproperties.tool='".TOOL_CALENDAR_EVENT."'
599 599
 					AND (toolitemproperties.to_group_id='0' OR toolitemproperties.to_group_id IS NULL)
600 600
 					AND toolitemproperties.visibility='1'";
601 601
 
602
-	$result = Database::query($sql);
603
-
604
-	while ($myrow = Database::fetch_array($result))
605
-	{
606
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\">";
607
-		echo "<img src='../img/agenda.gif' alt='agenda'>";
608
-		echo api_convert_and_format_date($myrow["start_date"], null, date_default_timezone_get())."<br />";
609
-		echo "<b>".$myrow["title"]."</b></td></tr><tr><td>";
610
-		echo $myrow["content"]."<br />";
611
-		showorhide_addresourcelink($content, $myrow["id"]);
612
-		echo "</td></tr></table><br />";
613
-	}
602
+    $result = Database::query($sql);
603
+
604
+    while ($myrow = Database::fetch_array($result))
605
+    {
606
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\">";
607
+        echo "<img src='../img/agenda.gif' alt='agenda'>";
608
+        echo api_convert_and_format_date($myrow["start_date"], null, date_default_timezone_get())."<br />";
609
+        echo "<b>".$myrow["title"]."</b></td></tr><tr><td>";
610
+        echo $myrow["content"]."<br />";
611
+        showorhide_addresourcelink($content, $myrow["id"]);
612
+        echo "</td></tr></table><br />";
613
+    }
614 614
 } // end if ($_GET["resource"]=="Agenda")
615 615
 
616 616
 /*
@@ -620,12 +620,12 @@  discard block
 block discarded – undo
620 620
 */
621 621
 if ($content == "chapter")
622 622
 {
623
-	echo '<table><form name="add_chapter" action="'.'" method="POST">'."\n";
624
-	echo '  <tr><td>'.get_lang('Title').'</td><td><input type="text" name="title" value="'.$title.'"></input></td></tr>'."\n";
625
-	echo '  <tr><td>'.get_lang('Description').'</td><td><input type="text" name="description" value="'.$description.'"></input></td></tr>'."\n";
626
-	echo '  <tr><td></td><td><input type="submit" name="add_chapter" value="'.get_lang('AddIt').'"/></td></tr>'."\n";
627
-	echo '</form></table>'."\n";
628
-	//echo "<hr>";
623
+    echo '<table><form name="add_chapter" action="'.'" method="POST">'."\n";
624
+    echo '  <tr><td>'.get_lang('Title').'</td><td><input type="text" name="title" value="'.$title.'"></input></td></tr>'."\n";
625
+    echo '  <tr><td>'.get_lang('Description').'</td><td><input type="text" name="description" value="'.$description.'"></input></td></tr>'."\n";
626
+    echo '  <tr><td></td><td><input type="submit" name="add_chapter" value="'.get_lang('AddIt').'"/></td></tr>'."\n";
627
+    echo '</form></table>'."\n";
628
+    //echo "<hr>";
629 629
 }
630 630
 
631 631
 /*
@@ -640,23 +640,23 @@  discard block
 block discarded – undo
640 640
 //				b. one is a student AND the documents tool is active. Student cannot add documents if the documents tool is inactive (teacher can do this)
641 641
 if ($content == "Document" OR (empty($content) AND (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT,$active_modules))) AND !$_GET['showresources'])
642 642
 {
643
-	// setting variables for file locations
644
-	$baseServDir = $_configuration['root_sys'];
645
-	$courseDir = $_course['path']."/document";
646
-	$baseWorkDir = $baseServDir.$courseDir;
647
-	// showing the link to move one folder up (when not in the root folder)
648
-	show_folder_up();
649
-	// showing the blue bar with the path in it when we are not in the root
650
-	if (get_levels($folder))
651
-	{
652
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#4171B5\">";
653
-		echo "<img src=\"../img/opendir.gif\" alt='directory'><font color=\"#ffffff\"><b>";
654
-		echo $folder."</b></font></td></tr></table>";
655
-	}
656
-
657
-	// showing the documents and subfolders of the folder we are in.
658
-	show_documents($folder);
659
-	//echo "<hr>";
643
+    // setting variables for file locations
644
+    $baseServDir = $_configuration['root_sys'];
645
+    $courseDir = $_course['path']."/document";
646
+    $baseWorkDir = $baseServDir.$courseDir;
647
+    // showing the link to move one folder up (when not in the root folder)
648
+    show_folder_up();
649
+    // showing the blue bar with the path in it when we are not in the root
650
+    if (get_levels($folder))
651
+    {
652
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#4171B5\">";
653
+        echo "<img src=\"../img/opendir.gif\" alt='directory'><font color=\"#ffffff\"><b>";
654
+        echo $folder."</b></font></td></tr></table>";
655
+    }
656
+
657
+    // showing the documents and subfolders of the folder we are in.
658
+    show_documents($folder);
659
+    //echo "<hr>";
660 660
 }
661 661
 
662 662
 /*
@@ -666,8 +666,8 @@  discard block
 block discarded – undo
666 666
 */
667 667
 if ($content == "Ad_Valvas")
668 668
 {
669
-	$tbl_announcement = Database :: get_course_table(TABLE_ANNOUNCEMENT);
670
-	$sql = "SELECT * FROM ".$tbl_announcement." a, ".$item_property_table." i
669
+    $tbl_announcement = Database :: get_course_table(TABLE_ANNOUNCEMENT);
670
+    $sql = "SELECT * FROM ".$tbl_announcement." a, ".$item_property_table." i
671 671
 			WHERE
672 672
 				i.tool = '".TOOL_ANNOUNCEMENT."' AND
673 673
 				a.id=i.ref AND
@@ -676,17 +676,17 @@  discard block
 block discarded – undo
676 676
 				i.to_user_id IS NULL
677 677
 			ORDER BY a.display_order ASC";
678 678
 
679
-	$result = Database::query($sql);
680
-	while ($myrow = Database::fetch_array($result))
681
-	{
682
-		echo "<table width=\"100%\"><tr><td>";
683
-		echo "<img src='../img/valves.gif' alt='advalvas'>";
684
-		echo api_convert_and_format_date($myrow["end_date"], DATE_FORMAT_LONG, date_default_timezone_get());
685
-		echo "</td></tr><tr><td>";
686
-		echo $myrow["title"]."<br />";
687
-		showorhide_addresourcelink($content, $myrow["id"]);
688
-		echo "</td></tr></table>";
689
-	}
679
+    $result = Database::query($sql);
680
+    while ($myrow = Database::fetch_array($result))
681
+    {
682
+        echo "<table width=\"100%\"><tr><td>";
683
+        echo "<img src='../img/valves.gif' alt='advalvas'>";
684
+        echo api_convert_and_format_date($myrow["end_date"], DATE_FORMAT_LONG, date_default_timezone_get());
685
+        echo "</td></tr><tr><td>";
686
+        echo $myrow["title"]."<br />";
687
+        showorhide_addresourcelink($content, $myrow["id"]);
688
+        echo "</td></tr></table>";
689
+    }
690 690
 }
691 691
 
692 692
 /*
@@ -696,75 +696,75 @@  discard block
 block discarded – undo
696 696
 */
697 697
 if ($content == "Forum")
698 698
 {
699
-	$TBL_FORUMS 		= Database::get_course_table(TABLE_FORUM);
700
-	$TBL_CATAGORIES 	= Database::get_course_table(TABLE_FORUM_CATEGORY);
701
-	$TBL_FORUMTOPICS 	= Database::get_course_table(TABLE_FORUM_POST);
702
-	$tbl_posts 			= Database::get_course_table(TABLE_FORUM_POST);
703
-	$tbl_posts_text 	= Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
704
-
705
-	echo "<table width='100%'>";
699
+    $TBL_FORUMS 		= Database::get_course_table(TABLE_FORUM);
700
+    $TBL_CATAGORIES 	= Database::get_course_table(TABLE_FORUM_CATEGORY);
701
+    $TBL_FORUMTOPICS 	= Database::get_course_table(TABLE_FORUM_POST);
702
+    $tbl_posts 			= Database::get_course_table(TABLE_FORUM_POST);
703
+    $tbl_posts_text 	= Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
704
+
705
+    echo "<table width='100%'>";
706
+
707
+    // displaying the categories and the forums
708
+    if (!$forum and !$thread)
709
+    {
710
+        $sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_CATAGORIES." categories WHERE forums.cat_id=categories.cat_id ORDER BY forums.cat_id DESC";
711
+        $result = Database::query($sql);
712
+        while ($myrow = Database::fetch_array($result))
713
+        {
714
+            if ($myrow["cat_title"] !== $old_cat_title)
715
+            {
716
+                echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
717
+            }
718
+            $old_cat_title = $myrow["cat_title"];
719
+            echo "<tr><td><img src='../img/forum.gif'><a href='".api_get_self()."?content=Forum&category=".$myrow["cat_id"]."&forum=".$myrow["forum_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["forum_name"]."</td><td>";
720
+            showorhide_addresourcelink("Forum", $myrow["forum_id"]);
721
+            echo "</td></tr>";
722
+        }
723
+    }
724
+    //displaying all the threads of one forum
725
+    if ($forum)
726
+    {
727
+        // displaying the category title
728
+        $sql = "SELECT * FROM ".$TBL_CATAGORIES." WHERE cat_id=$category";
729
+        $result = Database::query($sql);
730
+        $myrow = Database::fetch_array($result);
731
+        echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
732
+
733
+        // displaying the forum title
734
+        $sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_FORUMTOPICS." topics WHERE forums.forum_id=topics.forum_id";
735
+        $result = Database::query($sql);
736
+        $myrow = Database::fetch_array($result);
737
+        echo "<tr><td bgcolor='#cccccc' colspan='2'><b>".$myrow["forum_name"]."</b></td></tr>";
738
+
739
+        if (!$thread)
740
+        {
741
+            // displaying all the threads of this forum
742
+            $sql = "SELECT * FROM ".$TBL_FORUMTOPICS." WHERE forum_id=$forum";
743
+            $result = Database::query($sql);
744
+            while ($myrow = Database::fetch_array($result))
745
+            {
746
+                echo "<tr><td><a href='".api_get_self()."?content=Forum&category=$category&forum=1&thread=".$myrow["topic_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["topic_title"]."</a>  (".$myrow["prenom"]." ".$myrow["nom"].")</td><td>";
747
+                showorhide_addresourcelink("Thread", $myrow["topic_id"]);
748
+                echo "</td></tr>";
749
+            }
750
+        }
751
+        else
752
+        {
753
+            // displaying all the replies
754
+            $sql = "SELECT * FROM ".$tbl_posts." post, ".$tbl_posts_text." post_text WHERE post_text.post_id=post.post_id and post.topic_id=$thread ORDER BY post_text.post_id ASC";
755
+            $result = Database::query($sql);
756
+            while ($myrow = Database::fetch_array($result))
757
+            {
758
+                echo "<tr><td><b>".$myrow["post_title"]."</b><br>";
759
+                echo $myrow["post_text"]."</td>";
760
+                echo "<td>";
761
+                showorhide_addresourcelink("Post", $myrow["post_id"]);
762
+                echo "</td></tr><tr><td colspan='2'><hr noshade></td></tr>";
763
+            }
706 764
 
707
-	// displaying the categories and the forums
708
-	if (!$forum and !$thread)
709
-	{
710
-		$sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_CATAGORIES." categories WHERE forums.cat_id=categories.cat_id ORDER BY forums.cat_id DESC";
711
-		$result = Database::query($sql);
712
-		while ($myrow = Database::fetch_array($result))
713
-		{
714
-			if ($myrow["cat_title"] !== $old_cat_title)
715
-			{
716
-				echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
717
-			}
718
-			$old_cat_title = $myrow["cat_title"];
719
-			echo "<tr><td><img src='../img/forum.gif'><a href='".api_get_self()."?content=Forum&category=".$myrow["cat_id"]."&forum=".$myrow["forum_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["forum_name"]."</td><td>";
720
-			showorhide_addresourcelink("Forum", $myrow["forum_id"]);
721
-			echo "</td></tr>";
722
-		}
723
-	}
724
-	//displaying all the threads of one forum
725
-	if ($forum)
726
-	{
727
-		// displaying the category title
728
-		$sql = "SELECT * FROM ".$TBL_CATAGORIES." WHERE cat_id=$category";
729
-		$result = Database::query($sql);
730
-		$myrow = Database::fetch_array($result);
731
-		echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
732
-
733
-		// displaying the forum title
734
-		$sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_FORUMTOPICS." topics WHERE forums.forum_id=topics.forum_id";
735
-		$result = Database::query($sql);
736
-		$myrow = Database::fetch_array($result);
737
-		echo "<tr><td bgcolor='#cccccc' colspan='2'><b>".$myrow["forum_name"]."</b></td></tr>";
738
-
739
-		if (!$thread)
740
-		{
741
-			// displaying all the threads of this forum
742
-			$sql = "SELECT * FROM ".$TBL_FORUMTOPICS." WHERE forum_id=$forum";
743
-			$result = Database::query($sql);
744
-			while ($myrow = Database::fetch_array($result))
745
-			{
746
-				echo "<tr><td><a href='".api_get_self()."?content=Forum&category=$category&forum=1&thread=".$myrow["topic_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["topic_title"]."</a>  (".$myrow["prenom"]." ".$myrow["nom"].")</td><td>";
747
-				showorhide_addresourcelink("Thread", $myrow["topic_id"]);
748
-				echo "</td></tr>";
749
-			}
750
-		}
751
-		else
752
-		{
753
-			// displaying all the replies
754
-			$sql = "SELECT * FROM ".$tbl_posts." post, ".$tbl_posts_text." post_text WHERE post_text.post_id=post.post_id and post.topic_id=$thread ORDER BY post_text.post_id ASC";
755
-			$result = Database::query($sql);
756
-			while ($myrow = Database::fetch_array($result))
757
-			{
758
-				echo "<tr><td><b>".$myrow["post_title"]."</b><br>";
759
-				echo $myrow["post_text"]."</td>";
760
-				echo "<td>";
761
-				showorhide_addresourcelink("Post", $myrow["post_id"]);
762
-				echo "</td></tr><tr><td colspan='2'><hr noshade></td></tr>";
763
-			}
764
-
765
-		}
766
-	}
767
-	echo "</table>";
765
+        }
766
+    }
767
+    echo "</table>";
768 768
 }
769 769
 
770 770
 /*
@@ -774,57 +774,57 @@  discard block
 block discarded – undo
774 774
 */
775 775
 if ($content == "Link")
776 776
 {
777
-	// including the links language file
778
-	include ("../lang/$language/link.inc.php");
779
-
780
-	$tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
781
-	if (($learnpath_id != '') and ($content == 'Link'))
782
-	{
783
-		echo "<form name='learnpath_link'><table>";
784
-		echo "<tr></td><td align='left'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target' onchange='targetfunc()'><option value='_self' ";
785
-		if ($target == '_self')
786
-		{
787
-			echo "selected";
788
-		}
789
-		echo ">".get_lang('SameWindow')."</option><option value='_blank'";
790
-		if ($target == '_blank')
791
-		{
792
-			echo "selected";
793
-		}
794
-		echo ">".get_lang('NewWindow')."</option></select></td></tr></table></form>";
795
-	}
796
-
797
-	// showing the links that are in the root (having no category)
798
-	$sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
799
-	$result = Database::query($sql);
800
-	if (Database::num_rows($result) > 0)
801
-	{
802
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".get_lang('NoCategory')."</i></td></tr></table>";
803
-		while ($myrow = Database::fetch_array($result))
804
-		{
805
-			echo "<img src='../img/links.gif'>".$myrow["title"];
806
-			echo "<br>";
807
-			showorhide_addresourcelink($content, $myrow["id"]);
808
-			echo "<br><br>";
809
-		}
810
-	}
811
-
812
-	// showing the categories and the links in it.
813
-	$sqlcategories = "SELECT * FROM ".$tbl_categories." ORDER by display_order DESC";
814
-	$resultcategories = Database::query($sqlcategories) or die;
815
-	while ($myrow = @ Database::fetch_array($resultcategories))
816
-	{
817
-		$sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
818
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
819
-		$result_links = Database::query($sql_links);
820
-		while ($myrow = Database::fetch_array($result_links))
821
-		{
822
-			echo "<img src='../img/links.gif' />".$myrow["title"];
823
-			echo "<br>";
824
-			showorhide_addresourcelink($content, $myrow["id"]);
825
-			echo "<br><br>";
826
-		}
827
-	}
777
+    // including the links language file
778
+    include ("../lang/$language/link.inc.php");
779
+
780
+    $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
781
+    if (($learnpath_id != '') and ($content == 'Link'))
782
+    {
783
+        echo "<form name='learnpath_link'><table>";
784
+        echo "<tr></td><td align='left'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target' onchange='targetfunc()'><option value='_self' ";
785
+        if ($target == '_self')
786
+        {
787
+            echo "selected";
788
+        }
789
+        echo ">".get_lang('SameWindow')."</option><option value='_blank'";
790
+        if ($target == '_blank')
791
+        {
792
+            echo "selected";
793
+        }
794
+        echo ">".get_lang('NewWindow')."</option></select></td></tr></table></form>";
795
+    }
796
+
797
+    // showing the links that are in the root (having no category)
798
+    $sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
799
+    $result = Database::query($sql);
800
+    if (Database::num_rows($result) > 0)
801
+    {
802
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".get_lang('NoCategory')."</i></td></tr></table>";
803
+        while ($myrow = Database::fetch_array($result))
804
+        {
805
+            echo "<img src='../img/links.gif'>".$myrow["title"];
806
+            echo "<br>";
807
+            showorhide_addresourcelink($content, $myrow["id"]);
808
+            echo "<br><br>";
809
+        }
810
+    }
811
+
812
+    // showing the categories and the links in it.
813
+    $sqlcategories = "SELECT * FROM ".$tbl_categories." ORDER by display_order DESC";
814
+    $resultcategories = Database::query($sqlcategories) or die;
815
+    while ($myrow = @ Database::fetch_array($resultcategories))
816
+    {
817
+        $sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
818
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
819
+        $result_links = Database::query($sql_links);
820
+        while ($myrow = Database::fetch_array($result_links))
821
+        {
822
+            echo "<img src='../img/links.gif' />".$myrow["title"];
823
+            echo "<br>";
824
+            showorhide_addresourcelink($content, $myrow["id"]);
825
+            echo "<br><br>";
826
+        }
827
+    }
828 828
 }
829 829
 
830 830
 /*
@@ -834,31 +834,31 @@  discard block
 block discarded – undo
834 834
 */
835 835
 if (($content == "Exercise") or ($content == "HotPotatoes"))
836 836
 {
837
-	$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
838
-	$result = Database::query("SELECT * FROM ".$TBL_EXERCICES." WHERE active='1' ORDER BY id ASC");
839
-	while ($myrow = Database::fetch_array($result))
840
-	{
841
-		echo "<img src='../img/quiz.gif'>".$myrow["title"]."<br>";
842
-		showorhide_addresourcelink($content, $myrow["id"]);
843
-		echo "<br><br>";
844
-	}
837
+    $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
838
+    $result = Database::query("SELECT * FROM ".$TBL_EXERCICES." WHERE active='1' ORDER BY id ASC");
839
+    while ($myrow = Database::fetch_array($result))
840
+    {
841
+        echo "<img src='../img/quiz.gif'>".$myrow["title"]."<br>";
842
+        showorhide_addresourcelink($content, $myrow["id"]);
843
+        echo "<br><br>";
844
+    }
845
+
846
+    if ($from_learnpath == 'yes')
847
+    {
848
+        $uploadPath = "/HotPotatoes_files";
849
+        $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
850
+        $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
851
+        $sql = "SELECT * FROM ".$TBL_DOCUMENT." WHERE (path LIKE '%htm%' OR path LIKE '%html%') AND path LIKE '".$uploadPath."/%/%' ORDER BY id ASC";
852
+        $result = Database::query($sql);
853
+        while ($myrow = Database::fetch_array($result))
854
+        {
855
+            $path = $myrow["path"];
856
+            echo "<img src='../img/jqz.gif'>".GetQuizName($path, $documentPath)."<br>";
857
+            showorhide_addresourcelink("HotPotatoes", $myrow["id"]);
858
+            echo "<br><br>";
845 859
 
846
-	if ($from_learnpath == 'yes')
847
-	{
848
-		$uploadPath = "/HotPotatoes_files";
849
-		$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
850
-		$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
851
-		$sql = "SELECT * FROM ".$TBL_DOCUMENT." WHERE (path LIKE '%htm%' OR path LIKE '%html%') AND path LIKE '".$uploadPath."/%/%' ORDER BY id ASC";
852
-		$result = Database::query($sql);
853
-		while ($myrow = Database::fetch_array($result))
854
-		{
855
-			$path = $myrow["path"];
856
-			echo "<img src='../img/jqz.gif'>".GetQuizName($path, $documentPath)."<br>";
857
-			showorhide_addresourcelink("HotPotatoes", $myrow["id"]);
858
-			echo "<br><br>";
859
-
860
-		}
861
-	}
860
+        }
861
+    }
862 862
 }
863 863
 
864 864
 /*
@@ -876,10 +876,10 @@  discard block
 block discarded – undo
876 876
       <td align="left"><input name="external_link" type="text" id="external_link" value="http://"></td>
877 877
 	  <?php
878 878
 
879
-	if ($learnpath_id != '')
880
-	{
881
-		echo "</tr><tr><td align='right'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target'><option value='_self'>".get_lang('SameWindow')."</option><option value='_blank'>".get_lang('NewWindow')."</option></select></td>";
882
-	}
879
+    if ($learnpath_id != '')
880
+    {
881
+        echo "</tr><tr><td align='right'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target'><option value='_self'>".get_lang('SameWindow')."</option><option value='_blank'>".get_lang('NewWindow')."</option></select></td>";
882
+    }
883 883
 ?>
884 884
 	</tr>
885 885
     <tr>
@@ -891,14 +891,14 @@  discard block
 block discarded – undo
891 891
 	  <option value="0"><?php echo get_lang('MainCategory'); ?></option>
892 892
 		<?php
893 893
 
894
-	$tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
895
-	$sql = "SELECT * FROM $tbl_categories ORDER BY display_order ASC";
896
-	echo $sql;
897
-	$result = Database::query($sql);
898
-	while ($row = Database::fetch_array($result))
899
-	{
900
-		echo "<option value='".$row["id"]."'>".$row["category_title"]."</option>";
901
-	}
894
+    $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
895
+    $sql = "SELECT * FROM $tbl_categories ORDER BY display_order ASC";
896
+    echo $sql;
897
+    $result = Database::query($sql);
898
+    while ($row = Database::fetch_array($result))
899
+    {
900
+        echo "<option value='".$row["id"]."'>".$row["category_title"]."</option>";
901
+    }
902 902
 ?>
903 903
 
904 904
       </select><?php } ?></td>
@@ -927,7 +927,7 @@  discard block
 block discarded – undo
927 927
 */
928 928
 if ($content == "Assignment")
929 929
 {
930
-	echo "<a href=".api_get_self()."?content=Ass&add=Ass&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".get_lang('AddAssignmentPage')."</a>";
930
+    echo "<a href=".api_get_self()."?content=Ass&add=Ass&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".get_lang('AddAssignmentPage')."</a>";
931 931
 }
932 932
 
933 933
 /*
@@ -937,7 +937,7 @@  discard block
 block discarded – undo
937 937
 */
938 938
 if ($content == "Dropbox")
939 939
 {
940
-	echo "<a href='".api_get_self()."?content=Drop&add=Drop&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('DropboxAdd')."</a>";
940
+    echo "<a href='".api_get_self()."?content=Drop&add=Drop&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('DropboxAdd')."</a>";
941 941
 }
942 942
 
943 943
 /*
@@ -947,7 +947,7 @@  discard block
 block discarded – undo
947 947
 */
948 948
 if ($content == "Introduction_text")
949 949
 {
950
-	echo "<a href='".api_get_self()."?content=Intro&add=Intro&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('IntroductionTextAdd')."</a>";
950
+    echo "<a href='".api_get_self()."?content=Intro&add=Intro&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('IntroductionTextAdd')."</a>";
951 951
 }
952 952
 
953 953
 /*
@@ -957,7 +957,7 @@  discard block
 block discarded – undo
957 957
 */
958 958
 if ($content == "Course_description")
959 959
 {
960
-	echo "<a href='".api_get_self()."?content=Course_desc&add=Course_desc&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('CourseDescriptionAdd')."</a>";
960
+    echo "<a href='".api_get_self()."?content=Course_desc&add=Course_desc&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('CourseDescriptionAdd')."</a>";
961 961
 }
962 962
 
963 963
 /*
@@ -967,7 +967,7 @@  discard block
 block discarded – undo
967 967
 */
968 968
 if ($content == "Groups")
969 969
 {
970
-	echo "<a href='".api_get_self()."?content=Group&add=Group&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('$GroupsAdd')."</a>";
970
+    echo "<a href='".api_get_self()."?content=Group&add=Group&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('$GroupsAdd')."</a>";
971 971
 }
972 972
 
973 973
 /*
@@ -977,13 +977,13 @@  discard block
 block discarded – undo
977 977
 */
978 978
 if ($content == "Users")
979 979
 {
980
-	echo "<a href='".api_get_self()."?content=User&add=User&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('UsersAdd')."</a>";
980
+    echo "<a href='".api_get_self()."?content=User&add=User&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('UsersAdd')."</a>";
981 981
 }
982 982
 
983 983
 if ($showresources)
984 984
 {
985
-	//echo "<h4>".get_lang('ResourceAdded')."</h4>";
986
-	display_resources(1);
985
+    //echo "<h4>".get_lang('ResourceAdded')."</h4>";
986
+    display_resources(1);
987 987
 }
988 988
 
989 989
 echo "</td></tr></table>";
Please login to merge, or discard this patch.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 use ChamiloSession as Session;
18 18
 
19 19
 include ('../inc/global.inc.php');
20
-$this_section=SECTION_COURSES;
20
+$this_section = SECTION_COURSES;
21 21
 
22 22
 api_protect_course_script();
23 23
 
@@ -110,11 +110,11 @@  discard block
 block discarded – undo
110 110
 	$max_temp2 = $row[0];
111 111
 	if ($max_temp2 > $max_temp)
112 112
 	{
113
-		$order = $max_temp2 +1;
113
+		$order = $max_temp2 + 1;
114 114
 	}
115 115
 	else
116 116
 	{
117
-		$order = $max_temp +1;
117
+		$order = $max_temp + 1;
118 118
 	}
119 119
 
120 120
 	$sql = "INSERT INTO $tbl_learnpath_chapter "."(learnpath_id,chapter_name,chapter_description,parent_chapter_id,display_order) "." VALUES "."($learnpath_id, '$title', '$description', $chapter_id, $order )";
@@ -186,21 +186,21 @@  discard block
 block discarded – undo
186 186
 		//calculating the last order of the items of this chapter
187 187
 		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE chapter_id=$chapter_id";
188 188
 		$result = Database::query($sql);
189
-		if(Database::num_rows($result)==0){
189
+		if (Database::num_rows($result) == 0) {
190 190
 			$lastorder_item = 0;
191
-		}else{
191
+		} else {
192 192
 			$row = Database::fetch_array($result);
193 193
 			$lastorder_item = ($row[0]);
194 194
 		}
195 195
 		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
196 196
 		$result = Database::query($sql);
197
-		if(Database::num_rows($result)==0){
197
+		if (Database::num_rows($result) == 0) {
198 198
 			$lastorder_chapter = 0;
199
-		}else{
199
+		} else {
200 200
 			$row = Database::fetch_array($result);
201 201
 			$lastorder_chapter = ($row[0]);
202 202
 		}
203
-		$lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
203
+		$lastorder = ($lastorder_chapter > $lastorder_item ? $lastorder_chapter + 1 : $lastorder_item + 1);
204 204
 
205 205
 		foreach ($addedresource as $addedresource_item)
206 206
 		{
@@ -251,8 +251,8 @@  discard block
 block discarded – undo
251 251
 				$addedresourceassigned[$i] = 1;
252 252
 				$resource_added = true;
253 253
 			}
254
-			$i ++;
255
-			$lastorder ++;
254
+			$i++;
255
+			$lastorder++;
256 256
 		}
257 257
 		//$_SESSION['addedresource']=null;
258 258
 		//$_SESSION['addedresourceid']=null;
@@ -294,34 +294,34 @@  discard block
 block discarded – undo
294 294
 				$url = "../calendar/agenda.php?action=add";
295 295
 			}
296 296
 			$originaltoolname = get_lang("Agenda");
297
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
297
+			$breadcrumbelement = array("url" => $url, "name" => $originaltoolname);
298 298
 			session_unregister('from_learnpath');
299 299
 			unset ($from_learnpath);
300 300
 			break;
301 301
 		case "2" : // coming from forum: new topic
302 302
 			$url = "../phpbb/newtopic.php?forum=$source_forum&md5=$md5";
303 303
 			$originaltoolname = get_lang("ForumAddNewTopic");
304
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
304
+			$breadcrumbelement = array("url" => $url, "name" => $originaltoolname);
305 305
 			session_unregister('from_learnpath');
306 306
 			unset ($from_learnpath);
307 307
 			break;
308 308
 		case "3" : // coming from forum: edit topic
309 309
 			$url = "../phpbb/editpost.php?post_id=$post_id&topic=$topic&forum=$forum&md5=$md5&originalresource=no";
310 310
 			$originaltoolname = get_lang("ForumEditTopic");
311
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
311
+			$breadcrumbelement = array("url" => $url, "name" => $originaltoolname);
312 312
 			session_unregister('from_learnpath');
313 313
 			unset ($from_learnpath);
314 314
 			break;
315 315
 		case "4" : // coming from exercises: edit topic
316 316
 			$url = "../exercice/admin.php?modifyAnswers=$modifyAnswers";
317 317
 			$originaltoolname = get_lang("ExerciseAnswers");
318
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
318
+			$breadcrumbelement = array("url" => $url, "name" => $originaltoolname);
319 319
 			session_unregister('from_learnpath');
320 320
 			unset ($from_learnpath);
321 321
 			break;
322 322
 		case "5" : // coming from learning path
323 323
 			$from_learnpath = 'yes';
324
-			Session::write('from_learnpath',$from_learnpath);
324
+			Session::write('from_learnpath', $from_learnpath);
325 325
 			break;
326 326
 			/*************************************** end add [email protected] *********************************/
327 327
 
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 	// We do not come from the learning path. We store the name of the tool & url in a session.
330 330
 	if ($from_learnpath != 'yes')
331 331
 	{
332
-		if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"]<>$interbreadcrumb["url"])
332
+		if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"] <> $interbreadcrumb["url"])
333 333
 		{
334 334
 			$_SESSION["origintoolurl"] = $breadcrumbelement["url"];
335 335
 			$_SESSION["origintoolname"] = $breadcrumbelement["name"];
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 if ($from_learnpath != 'yes')
345 345
 {
346 346
 	$nameTools = get_lang('AddResource');
347
-	$interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
347
+	$interbreadcrumb[] = array("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
348 348
 }
349 349
 else
350 350
 {
@@ -360,9 +360,9 @@  discard block
 block discarded – undo
360 360
 
361 361
 	$from_learnpath = 'yes';
362 362
 	session_register('from_learnpath');
363
-	$interbreadcrumb[] = array ("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
364
-	$interbreadcrumb[] = array ("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
365
-	$interbreadcrumb[] = array ("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
363
+	$interbreadcrumb[] = array("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
364
+	$interbreadcrumb[] = array("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
365
+	$interbreadcrumb[] = array("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
366 366
 
367 367
 }
368 368
 
@@ -387,13 +387,13 @@  discard block
 block discarded – undo
387 387
 // we retrieve the tools that are active.
388 388
 // We use this to check which resources a student may add (only the modules that are active)
389 389
 // see http://www.dokeos.com/forum/viewtopic.php?t=4858
390
-$active_modules=array();
390
+$active_modules = array();
391 391
 $tool_table = Database::get_course_table(TABLE_TOOL_LIST);
392
-$sql_select_active="SELECT * FROM $tool_table WHERE visibility='1'";
393
-$result_select_active=Database::query($sql_select_active);
394
-while ($row=Database::fetch_array($result_select_active))
392
+$sql_select_active = "SELECT * FROM $tool_table WHERE visibility='1'";
393
+$result_select_active = Database::query($sql_select_active);
394
+while ($row = Database::fetch_array($result_select_active))
395 395
 {
396
-	$active_modules[]=$row['name'];
396
+	$active_modules[] = $row['name'];
397 397
 }
398 398
 
399 399
 
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
           <td width="26%"><b><?php echo get_lang('CourseResources'); ?></b></td>
409 409
         </tr>
410 410
         <?php
411
-        if (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT,$active_modules))
411
+        if (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT, $active_modules))
412 412
         {
413 413
         ?>
414 414
         <tr>
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
         </tr>
417 417
         <?php
418 418
         }
419
-        if (api_is_allowed_to_edit() OR in_array(TOOL_CALENDAR_EVENT,$active_modules))
419
+        if (api_is_allowed_to_edit() OR in_array(TOOL_CALENDAR_EVENT, $active_modules))
420 420
         {
421 421
         ?>
422 422
         <tr>
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
         </tr>
425 425
         <?php
426 426
         }
427
-        if (api_is_allowed_to_edit() OR in_array(TOOL_ANNOUNCEMENT,$active_modules))
427
+        if (api_is_allowed_to_edit() OR in_array(TOOL_ANNOUNCEMENT, $active_modules))
428 428
         {
429 429
         ?>
430 430
         <tr>
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
         </tr>
433 433
         <?php
434 434
         }
435
-        if (api_is_allowed_to_edit() OR in_array(TOOL_BB_FORUM,$active_modules))
435
+        if (api_is_allowed_to_edit() OR in_array(TOOL_BB_FORUM, $active_modules))
436 436
         {
437 437
         ?>
438 438
         <tr>
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
         </tr>
441 441
         <?php
442 442
         }
443
-        if (api_is_allowed_to_edit() OR in_array(TOOL_LINK,$active_modules))
443
+        if (api_is_allowed_to_edit() OR in_array(TOOL_LINK, $active_modules))
444 444
         {
445 445
         ?>
446 446
         <tr>
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
         </tr>
449 449
         <?php
450 450
         }
451
-        if (api_is_allowed_to_edit() OR in_array(TOOL_QUIZ,$active_modules))
451
+        if (api_is_allowed_to_edit() OR in_array(TOOL_QUIZ, $active_modules))
452 452
         {
453 453
         ?>
454 454
         <tr>
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 		<tr>
469 469
           <td width="26%"><b><?php echo get_lang('ExportableCourseResources'); ?></b></td>
470 470
         </tr>
471
-<?php if ($multi_level_learnpath === true ) { ?>
471
+<?php if ($multi_level_learnpath === true) { ?>
472 472
         <tr>
473 473
           <td><?php echo "<a href=\"".api_get_self()."?content=chapter&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('Chapter')."</a>"; ?></td>
474 474
         </tr>
@@ -589,10 +589,10 @@  discard block
 block discarded – undo
589 589
 // Agenda items -->
590 590
 if ($content == "Agenda")
591 591
 {
592
-	$TABLEAGENDA 			= Database::get_course_table(TABLE_AGENDA);
593
-	$TABLE_ITEM_PROPERTY 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
592
+	$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
593
+	$TABLE_ITEM_PROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
594 594
 
595
-	$sql="SELECT agenda.*, toolitemproperties.*
595
+	$sql = "SELECT agenda.*, toolitemproperties.*
596 596
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." toolitemproperties
597 597
 					WHERE agenda.id = toolitemproperties.ref
598 598
 					AND toolitemproperties.tool='".TOOL_CALENDAR_EVENT."'
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
 // 2. we come to the resource linker for the first time (documents = default). In this case it can only be shown if
639 639
 //  			a. one is a teacher (documents can be shown even if the tool is inactive)
640 640
 //				b. one is a student AND the documents tool is active. Student cannot add documents if the documents tool is inactive (teacher can do this)
641
-if ($content == "Document" OR (empty($content) AND (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT,$active_modules))) AND !$_GET['showresources'])
641
+if ($content == "Document" OR (empty($content) AND (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT, $active_modules))) AND !$_GET['showresources'])
642 642
 {
643 643
 	// setting variables for file locations
644 644
 	$baseServDir = $_configuration['root_sys'];
@@ -698,7 +698,7 @@  discard block
 block discarded – undo
698 698
 {
699 699
 	$TBL_FORUMS 		= Database::get_course_table(TABLE_FORUM);
700 700
 	$TBL_CATAGORIES 	= Database::get_course_table(TABLE_FORUM_CATEGORY);
701
-	$TBL_FORUMTOPICS 	= Database::get_course_table(TABLE_FORUM_POST);
701
+	$TBL_FORUMTOPICS = Database::get_course_table(TABLE_FORUM_POST);
702 702
 	$tbl_posts 			= Database::get_course_table(TABLE_FORUM_POST);
703 703
 	$tbl_posts_text 	= Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
704 704
 
@@ -883,9 +883,9 @@  discard block
 block discarded – undo
883 883
 ?>
884 884
 	</tr>
885 885
     <tr>
886
-      <td><?php if ($is_allowedToEdit) {echo get_lang('AddToLinks');} ?></td>
886
+      <td><?php if ($is_allowedToEdit) {echo get_lang('AddToLinks'); } ?></td>
887 887
       <td>
888
-  	  <?php if ($is_allowedToEdit){?>
888
+  	  <?php if ($is_allowedToEdit) {?>
889 889
 	  <select name="add_2_links" id="add_2_links">
890 890
       <option value="niet toevoegen" selected="selected">-<?php echo get_lang('DontAdd'); ?>-</option>
891 891
 	  <option value="0"><?php echo get_lang('MainCategory'); ?></option>
Please login to merge, or discard this patch.
Braces   +10 added lines, -18 removed lines patch added patch discarded remove patch
@@ -111,8 +111,7 @@  discard block
 block discarded – undo
111 111
 	if ($max_temp2 > $max_temp)
112 112
 	{
113 113
 		$order = $max_temp2 +1;
114
-	}
115
-	else
114
+	} else
116 115
 	{
117 116
 		$order = $max_temp +1;
118 117
 	}
@@ -145,8 +144,7 @@  discard block
 block discarded – undo
145 144
 		$addedresourceid[] = Database::insert_id();
146 145
 		$_SESSION['addedresource'] = $addedresource;
147 146
 		$_SESSION['addedresourceid'] = $addedresourceid;
148
-	}
149
-	else
147
+	} else
150 148
 	{
151 149
 		// do not add external link to the links table
152 150
 		$addedresource[] = "Externallink";
@@ -188,7 +186,7 @@  discard block
 block discarded – undo
188 186
 		$result = Database::query($sql);
189 187
 		if(Database::num_rows($result)==0){
190 188
 			$lastorder_item = 0;
191
-		}else{
189
+		} else{
192 190
 			$row = Database::fetch_array($result);
193 191
 			$lastorder_item = ($row[0]);
194 192
 		}
@@ -196,7 +194,7 @@  discard block
 block discarded – undo
196 194
 		$result = Database::query($sql);
197 195
 		if(Database::num_rows($result)==0){
198 196
 			$lastorder_chapter = 0;
199
-		}else{
197
+		} else{
200 198
 			$row = Database::fetch_array($result);
201 199
 			$lastorder_chapter = ($row[0]);
202 200
 		}
@@ -284,12 +282,10 @@  discard block
 block discarded – undo
284 282
 			if ($action == "edit")
285 283
 			{
286 284
 				$url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
287
-			}
288
-			elseif ($action == "add")
285
+			} elseif ($action == "add")
289 286
 		{
290 287
 				$url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
291
-			}
292
-			else
288
+			} else
293 289
 			{
294 290
 				$url = "../calendar/agenda.php?action=add";
295 291
 			}
@@ -345,8 +341,7 @@  discard block
 block discarded – undo
345 341
 {
346 342
 	$nameTools = get_lang('AddResource');
347 343
 	$interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
348
-}
349
-else
344
+} else
350 345
 {
351 346
 	$learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
352 347
 		  								WHERE learnpath_id=$learnpath_id";
@@ -458,8 +453,7 @@  discard block
 block discarded – undo
458 453
 		<?php
459 454
         }
460 455
 
461
-}
462
-else
456
+} else
463 457
 {
464 458
 ?>
465 459
 
@@ -558,8 +552,7 @@  discard block
 block discarded – undo
558 552
 if ($from_learnpath != 'yes')
559 553
 {
560 554
 	echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
561
-}
562
-else
555
+} else
563 556
 {
564 557
 	echo "<form method=\"get\" action=\"../learnpath/learnpath_handler.php\" style=\"margin: 0px;\"><input type=\"hidden\" name=\"learnpath_id\" value=\"".htmlentities($learnpath_id)."\"><input type=\"submit\" value=\"".'  '.get_lang('Ok').'  '."\"></form>";
565 558
 }
@@ -747,8 +740,7 @@  discard block
 block discarded – undo
747 740
 				showorhide_addresourcelink("Thread", $myrow["topic_id"]);
748 741
 				echo "</td></tr>";
749 742
 			}
750
-		}
751
-		else
743
+		} else
752 744
 		{
753 745
 			// displaying all the replies
754 746
 			$sql = "SELECT * FROM ".$tbl_posts." post, ".$tbl_posts_text." post_text WHERE post_text.post_id=post.post_id and post.topic_id=$thread ORDER BY post_text.post_id ASC";
Please login to merge, or discard this patch.
main/template/default/auth/courses_list.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
 
29 29
 // COURSES WITH CATEGORIES
30 30
 if (!empty($user_course_categories)) {
31
-       foreach ($user_course_categories as $row) {
32
-           echo Display::page_subheader($row['title']);
33
-           echo '<a name="category'.$row['id'].'"></a>';
31
+        foreach ($user_course_categories as $row) {
32
+            echo Display::page_subheader($row['title']);
33
+            echo '<a name="category'.$row['id'].'"></a>';
34 34
 
35
-           if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?>
35
+            if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?>
36 36
             <!-- We display the edit form for the category -->
37 37
 
38 38
             <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>">
@@ -243,15 +243,15 @@  discard block
 block discarded – undo
243 243
                     </a>
244 244
             <?php } else {
245 245
                     echo Display::display_icon('up_na.png', get_lang('Up'),'',22);
246
-                  }
246
+                    }
247 247
 
248
-                  if ($key < $number_of_courses - 1) { ?>
248
+                    if ($key < $number_of_courses - 1) { ?>
249 249
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
250 250
                     <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
251 251
                     </a>
252 252
             <?php } else {
253 253
                     echo Display::display_icon('down_na.png', get_lang('Down'),'',22);
254
-                  }?>
254
+                    }?>
255 255
                 </div>
256 256
                  <div style="float:left; margin-right:10px;">
257 257
                   <!-- cancel subscrioption-->
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
                     </div>
270 270
               <?php }
271 271
                 }
272
-              ?>
272
+                ?>
273 273
             </td>
274 274
             </tr>
275 275
             <?php
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 <!-- Actions: The menu with the different options in cathe course management -->
18 18
 <div id="actions" class="actions">
19 19
     <?php if ($action != 'createcoursecategory') { ?>
20
-	<a href="<?php echo api_get_self(); ?>?action=createcoursecategory"><?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'),'','32'); ?></a>
20
+	<a href="<?php echo api_get_self(); ?>?action=createcoursecategory"><?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'), '', '32'); ?></a>
21 21
     <?php } ?>
22 22
 </div>
23 23
 
@@ -49,26 +49,26 @@  discard block
 block discarded – undo
49 49
             $max_category_key = count($user_course_categories);
50 50
             if ($action != 'unsubscribe') { ?>
51 51
                 <a href="courses.php?action=sortmycourses&amp;categoryid=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>#category<?php echo $row['id']; ?>">
52
-                <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
52
+                <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
53 53
                 </a>
54 54
 
55 55
                 <?php if ($row['id'] != $user_course_categories[0]['id']) { ?>
56 56
                         <a href="courses.php?action=<?php echo $action ?>&amp;move=up&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
57
-                        <?php echo Display::return_icon('up.png', get_lang('Up'),'',22); ?>
57
+                        <?php echo Display::return_icon('up.png', get_lang('Up'), '', 22); ?>
58 58
                         </a>
59 59
                 <?php } else { ?>
60
-                    <?php echo Display::return_icon('up_na.png', get_lang('Up'),'',22); ?>
60
+                    <?php echo Display::return_icon('up_na.png', get_lang('Up'), '', 22); ?>
61 61
                <?php } ?>
62 62
 
63 63
                 <?php if ($row['id'] != $user_course_categories[$max_category_key - 1]['id']) { ?>
64 64
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
65
-                    <?php echo Display::return_icon('down.png', get_lang('Down'),'',22); ?>
65
+                    <?php echo Display::return_icon('down.png', get_lang('Down'), '', 22); ?>
66 66
                     </a>
67 67
                 <?php } else { ?>
68
-                    <?php echo Display::return_icon('down_na.png', get_lang('Down'),'',22); ?>
68
+                    <?php echo Display::return_icon('down_na.png', get_lang('Down'), '', 22); ?>
69 69
                 <?php } ?>
70 70
                 <a href="courses.php?action=deletecoursecategory&amp;id=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
71
-                <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"),22) ?>
71
+                <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"), 22) ?>
72 72
                 </a>
73 73
             <?php }
74 74
             echo '<br /><br />';
@@ -122,35 +122,35 @@  discard block
 block discarded – undo
122 122
                     <div style="float:left;width:110px;">
123 123
                     <?php
124 124
                         if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
125
-                            $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
125
+                            $icon_title = get_lang('CourseDetails').' - '.$course['title'];
126 126
                     ?>
127 127
                     <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax">
128
-                        <?php echo Display::return_icon('info.png', $icon_title,'','22') ?>
128
+                        <?php echo Display::return_icon('info.png', $icon_title, '', '22') ?>
129 129
                        <?php } ?>
130 130
                     </a>
131 131
 
132 132
                     <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) { ?>
133
-                          <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
133
+                          <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?>
134 134
                     <?php } else { ?>
135 135
                         <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
136
-                            <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
136
+                            <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
137 137
                             </a>
138 138
                     <?php } ?>
139 139
 
140 140
                     <?php if ($key > 0) { ?>
141 141
                         <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
142
-                        <?php echo Display::display_icon('up.png', get_lang('Up'),'',22); ?>
142
+                        <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22); ?>
143 143
                         </a>
144 144
                     <?php } else { ?>
145
-                        <?php echo Display::display_icon('up_na.png', get_lang('Up'),'',22); ?>
145
+                        <?php echo Display::display_icon('up_na.png', get_lang('Up'), '', 22); ?>
146 146
                     <?php } ?>
147 147
 
148 148
                     <?php if ($key < $number_of_courses - 1) { ?>
149 149
                         <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
150
-                        <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
150
+                        <?php echo Display::display_icon('down.png', get_lang('Down'), '', 22); ?>
151 151
                         </a>
152 152
                     <?php } else { ?>
153
-                        <?php echo Display::display_icon('down_na.png', get_lang('Down'),'',22); ?>
153
+                        <?php echo Display::display_icon('down_na.png', get_lang('Down'), '', 22); ?>
154 154
                     <?php } ?>
155 155
 
156 156
                   </div>
@@ -221,36 +221,36 @@  discard block
 block discarded – undo
221 221
             <div style="float:left; width:110px">
222 222
             <?php
223 223
             if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
224
-            $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
224
+            $icon_title = get_lang('CourseDetails').' - '.$course['title'];
225 225
             ?>
226 226
             <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax">
227
-                <?php echo Display::return_icon('info.png', $icon_title, '','22'); ?>
227
+                <?php echo Display::return_icon('info.png', $icon_title, '', '22'); ?>
228 228
             </a>
229 229
             <?php } ?>
230 230
 
231 231
              <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {   ?>
232
-                    <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
232
+                    <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?>
233 233
                   <?php } else { ?>
234 234
                     <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
235
-                    <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
235
+                    <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
236 236
                     </a>
237 237
              <?php } ?>
238 238
 
239 239
             <!-- up /down icons-->
240 240
             <?php if ($key > 0) { ?>
241 241
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
242
-                    <?php echo Display::display_icon('up.png', get_lang('Up'),'',22) ?>
242
+                    <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22) ?>
243 243
                     </a>
244 244
             <?php } else {
245
-                    echo Display::display_icon('up_na.png', get_lang('Up'),'',22);
245
+                    echo Display::display_icon('up_na.png', get_lang('Up'), '', 22);
246 246
                   }
247 247
 
248 248
                   if ($key < $number_of_courses - 1) { ?>
249 249
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
250
-                    <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
250
+                    <?php echo Display::display_icon('down.png', get_lang('Down'), '', 22); ?>
251 251
                     </a>
252 252
             <?php } else {
253
-                    echo Display::display_icon('down_na.png', get_lang('Down'),'',22);
253
+                    echo Display::display_icon('down_na.png', get_lang('Down'), '', 22);
254 254
                   }?>
255 255
                 </div>
256 256
                  <div style="float:left; margin-right:10px;">
Please login to merge, or discard this patch.
main/template/default/auth/categories_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 <!-- Actions: The menu with the different options in cathe course management -->
17 17
 <div id="actions" class="actions">
18 18
     <a href="<?php echo api_get_self() ?>?action=sortmycourses">
19
-        <?php echo Display::return_icon('back.png', get_lang('Back'),'','32'); ?>
19
+        <?php echo Display::return_icon('back.png', get_lang('Back'), '', '32'); ?>
20 20
     </a>
21 21
 </div>
22 22
 
Please login to merge, or discard this patch.
main/upload/upload_ppt.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
         if (in_array(strtolower(pathinfo($_FILES['user_file']['name'], PATHINFO_EXTENSION)), $allowed_extensions)) {
22 22
             require_once api_get_path(SYS_CODE_PATH).'newscorm/lp_upload.php';
23 23
             if (isset($o_ppt) && $first_item_id != 0) {
24
-                if (api_get_setting('search_enabled')=='true') {
24
+                if (api_get_setting('search_enabled') == 'true') {
25 25
                     require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
26 26
                     $specific_fields = get_specific_field_list();
27 27
                     foreach ($specific_fields as $specific_field) {
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
     api_not_allowed(true);
61 61
 }
62 62
 
63
-$interbreadcrumb[]= array ("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang("Doc"));
63
+$interbreadcrumb[] = array("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang("Doc"));
64 64
 
65 65
 $nameTools = get_lang("OogieConversionPowerPoint");
66 66
 Display :: display_header($nameTools);
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 $form->addElement('file', 'user_file', array('<img src="../img/powerpoint_big.gif" />', $div_upload_limit));
79 79
 $form->addElement('checkbox', 'take_slide_name', '', get_lang('TakeSlideName'));
80 80
 if (api_get_setting('search_enabled') == 'true') {
81
-    require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
81
+    require_once(api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php');
82 82
     $specific_fields = get_specific_field_list();
83 83
     $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument'));
84 84
     $form->addElement('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 $form->addButtonUpload(get_lang('ConvertToLP'), 'convert');
91 91
 $form->addElement('hidden', 'ppt2lp', 'true');
92 92
 $form->add_real_progress_bar(md5(rand(0, 10000)), 'user_file', 1, true);
93
-$defaults = array('take_slide_name'=>'checked="checked"','index_document'=>'checked="checked"');
93
+$defaults = array('take_slide_name'=>'checked="checked"', 'index_document'=>'checked="checked"');
94 94
 $form->setDefaults($defaults);
95 95
 
96 96
 // display the form
Please login to merge, or discard this patch.