@@ -9,9 +9,10 @@ |
||
9 | 9 | |
10 | 10 | // actions menu |
11 | 11 | $new_thematic_plan_data = array(); |
12 | -if (!empty($thematic_plan_data)) |
|
13 | -foreach($thematic_plan_data as $thematic_item) { |
|
12 | +if (!empty($thematic_plan_data)) { |
|
13 | + foreach($thematic_plan_data as $thematic_item) { |
|
14 | 14 | $thematic_simple_list[] = $thematic_item['description_type']; |
15 | +} |
|
15 | 16 | $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item; |
16 | 17 | } |
17 | 18 |
@@ -287,7 +287,10 @@ discard block |
||
287 | 287 | <td width="40%" align="center"> |
288 | 288 | <select name="UserList[]" multiple="multiple" size="20" style="width:300px;"> |
289 | 289 | <?php foreach ($db_users as $user) { ?> |
290 | - <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) echo 'selected="selected"'; ?>> |
|
290 | + <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) { |
|
291 | + echo 'selected="selected"'; |
|
292 | +} |
|
293 | +?>> |
|
291 | 294 | <?php |
292 | 295 | $userName = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; |
293 | 296 | if ($showOfficialCode) { |
@@ -308,7 +311,10 @@ discard block |
||
308 | 311 | <td width="40%" align="center"> |
309 | 312 | <select name="CourseList[]" multiple="multiple" size="20" style="width:300px;"> |
310 | 313 | <?php foreach ($db_courses as $course) { ?> |
311 | - <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>> |
|
314 | + <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) { |
|
315 | + echo 'selected="selected"'; |
|
316 | +} |
|
317 | +?>> |
|
312 | 318 | <?php echo '('.$course['visual_code'].') '.$course['title']; ?> |
313 | 319 | </option> |
314 | 320 | <?php } ?> |
@@ -64,9 +64,10 @@ |
||
64 | 64 | $new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : ''; |
65 | 65 | $new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : ''; |
66 | 66 | |
67 | - if ($new_path && ($new_comment || $new_title)) |
|
68 | - if (($docid = DocumentManager::get_document_id($_course, $new_path))) { |
|
67 | + if ($new_path && ($new_comment || $new_title)) { |
|
68 | + if (($docid = DocumentManager::get_document_id($_course, $new_path))) { |
|
69 | 69 | $table_document = Database::get_course_table(TABLE_DOCUMENT); |
70 | + } |
|
70 | 71 | $ct = ''; |
71 | 72 | if ($new_comment) { |
72 | 73 | $ct .= ", comment='$new_comment'"; |
@@ -679,12 +679,15 @@ discard block |
||
679 | 679 | $option1 = $option2 = $option3 = ''; |
680 | 680 | for ($k = 1; $k <= 100; $k++) { |
681 | 681 | $selected1 = $selected2 = $selected3 = ''; |
682 | - if ($k == $threadhold1[$i]) |
|
683 | - $selected1 = 'selected="selected"'; |
|
684 | - if ($k == $threadhold2[$i]) |
|
685 | - $selected2 = 'selected="selected"'; |
|
686 | - if ($k == $threadhold3[$i]) |
|
687 | - $selected3 = 'selected="selected"'; |
|
682 | + if ($k == $threadhold1[$i]) { |
|
683 | + $selected1 = 'selected="selected"'; |
|
684 | + } |
|
685 | + if ($k == $threadhold2[$i]) { |
|
686 | + $selected2 = 'selected="selected"'; |
|
687 | + } |
|
688 | + if ($k == $threadhold3[$i]) { |
|
689 | + $selected3 = 'selected="selected"'; |
|
690 | + } |
|
688 | 691 | $option1.='<option ' . $selected1 . ' >' . $k . ' % </option>'; |
689 | 692 | $option2.='<option ' . $selected2 . ' >' . $k . ' % </option>'; |
690 | 693 | $option3.='<option ' . $selected3 . '>' . $k . ' %</option>'; |
@@ -731,7 +734,10 @@ discard block |
||
731 | 734 | <div class="checkbox"> |
732 | 735 | <p> |
733 | 736 | <label> |
734 | - <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> /> |
|
737 | + <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) { |
|
738 | + echo'checked'; |
|
739 | +} |
|
740 | +?> /> |
|
735 | 741 | <?php echo get_lang('TryAgain'); ?> |
736 | 742 | </label> |
737 | 743 | </p> |
@@ -784,7 +790,10 @@ discard block |
||
784 | 790 | <div class="checkbox"> |
785 | 791 | <p> |
786 | 792 | <label> |
787 | - <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> /> |
|
793 | + <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) { |
|
794 | + echo'checked'; |
|
795 | +} |
|
796 | +?> /> |
|
788 | 797 | <?php echo get_lang('TryAgain'); ?> |
789 | 798 | </label> |
790 | 799 | </p> |
@@ -823,7 +832,10 @@ discard block |
||
823 | 832 | <th ><?php echo get_lang('OAR'); ?>*</th> |
824 | 833 | <?php if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { ?> |
825 | 834 | <th colspan="2" ><?php echo get_lang('Comment'); ?></th> |
826 | - <th ><?php if ($answerType == HOT_SPOT_DELINEATION) echo get_lang('Scenario'); ?></th> |
|
835 | + <th ><?php if ($answerType == HOT_SPOT_DELINEATION) { |
|
836 | + echo get_lang('Scenario'); |
|
837 | +} |
|
838 | +?></th> |
|
827 | 839 | <?php } else { ?> |
828 | 840 | <th colspan="3" ><?php echo get_lang('Comment'); ?></th> |
829 | 841 | <?php } ?> |
@@ -849,7 +861,10 @@ discard block |
||
849 | 861 | <div class="checkbox"> |
850 | 862 | <p> |
851 | 863 | <label> |
852 | - <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> /> |
|
864 | + <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) { |
|
865 | + echo'checked'; |
|
866 | +} |
|
867 | +?> /> |
|
853 | 868 | <?php echo get_lang('TryAgain'); ?> |
854 | 869 | </label> |
855 | 870 | </p> |
@@ -998,7 +1013,10 @@ discard block |
||
998 | 1013 | <div class="checkbox"> |
999 | 1014 | <p> |
1000 | 1015 | <label> |
1001 | - <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) echo'checked'; ?> /> |
|
1016 | + <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) { |
|
1017 | + echo'checked'; |
|
1018 | +} |
|
1019 | +?> /> |
|
1002 | 1020 | <?php echo get_lang('TryAgain'); ?> |
1003 | 1021 | </label> |
1004 | 1022 | </p> |
@@ -1007,8 +1007,9 @@ discard block |
||
1007 | 1007 | $blog_post_actions .= '</a>'; |
1008 | 1008 | } |
1009 | 1009 | |
1010 | - if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) |
|
1011 | - $rating_select = Blog::display_rating_form('post',$blog_id,$post_id); |
|
1010 | + if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) { |
|
1011 | + $rating_select = Blog::display_rating_form('post',$blog_id,$post_id); |
|
1012 | + } |
|
1012 | 1013 | |
1013 | 1014 | $blog_post_text=stripslashes($blog_post_text); |
1014 | 1015 | |
@@ -1652,8 +1653,9 @@ discard block |
||
1652 | 1653 | |
1653 | 1654 | $arrPermissions = array(); |
1654 | 1655 | |
1655 | - while ($row = Database::fetch_array($result)) |
|
1656 | - $arrPermissions[] = $row['action']; |
|
1656 | + while ($row = Database::fetch_array($result)) { |
|
1657 | + $arrPermissions[] = $row['action']; |
|
1658 | + } |
|
1657 | 1659 | |
1658 | 1660 | echo '<tr>'; |
1659 | 1661 | echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ': </td>'; |
@@ -2329,8 +2331,9 @@ discard block |
||
2329 | 2331 | //Handle leap year |
2330 | 2332 | $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); |
2331 | 2333 | |
2332 | - if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) |
|
2333 | - $numberofdays[2] = 29; |
|
2334 | + if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) { |
|
2335 | + $numberofdays[2] = 29; |
|
2336 | + } |
|
2334 | 2337 | |
2335 | 2338 | //Get the first day of the month |
2336 | 2339 | $dayone = getdate(mktime(0, 0, 0, $month, 1, $year)); |
@@ -2360,8 +2363,9 @@ discard block |
||
2360 | 2363 | if( Database::num_rows($result) > 0) { |
2361 | 2364 | while($blog_post = Database::fetch_array($result)) { |
2362 | 2365 | // If the day of this post is not yet in the array, add it. |
2363 | - if (!in_array($blog_post['post_day'], $posts)) |
|
2364 | - $posts[] = $blog_post['post_day']; |
|
2366 | + if (!in_array($blog_post['post_day'], $posts)) { |
|
2367 | + $posts[] = $blog_post['post_day']; |
|
2368 | + } |
|
2365 | 2369 | } |
2366 | 2370 | } |
2367 | 2371 | |
@@ -2400,8 +2404,9 @@ discard block |
||
2400 | 2404 | |
2401 | 2405 | echo "<tr>"; |
2402 | 2406 | |
2403 | - for($ii = 1; $ii < 8; $ii ++) |
|
2404 | - echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>"; |
|
2407 | + for($ii = 1; $ii < 8; $ii ++) { |
|
2408 | + echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>"; |
|
2409 | + } |
|
2405 | 2410 | |
2406 | 2411 | echo "</tr>"; |
2407 | 2412 | |
@@ -2411,8 +2416,9 @@ discard block |
||
2411 | 2416 | while ($curday <= $numberofdays[$month]) { |
2412 | 2417 | echo "<tr>"; |
2413 | 2418 | for ($ii = 0; $ii < 7; $ii ++) { |
2414 | - if (($curday == -1) && ($ii == $startdayofweek)) |
|
2415 | - $curday = 1; |
|
2419 | + if (($curday == -1) && ($ii == $startdayofweek)) { |
|
2420 | + $curday = 1; |
|
2421 | + } |
|
2416 | 2422 | |
2417 | 2423 | if (($curday > 0) && ($curday <= $numberofdays[$month])) { |
2418 | 2424 | $bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\""; |
@@ -2426,10 +2432,11 @@ discard block |
||
2426 | 2432 | echo "<td " . $class.">"; |
2427 | 2433 | |
2428 | 2434 | // If there are posts on this day, create a filter link. |
2429 | - if(in_array($curday, $posts)) |
|
2430 | - echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>'; |
|
2431 | - else |
|
2432 | - echo $dayheader; |
|
2435 | + if(in_array($curday, $posts)) { |
|
2436 | + echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>'; |
|
2437 | + } else { |
|
2438 | + echo $dayheader; |
|
2439 | + } |
|
2433 | 2440 | |
2434 | 2441 | if (count($tasks) > 0) { |
2435 | 2442 | if (isset($tasks[$curday]) && is_array($tasks[$curday])) { |
@@ -2444,8 +2451,9 @@ discard block |
||
2444 | 2451 | |
2445 | 2452 | echo "</td>"; |
2446 | 2453 | $curday ++; |
2447 | - } else |
|
2448 | - echo "<td> </td>"; |
|
2454 | + } else { |
|
2455 | + echo "<td> </td>"; |
|
2456 | + } |
|
2449 | 2457 | } |
2450 | 2458 | echo "</tr>"; |
2451 | 2459 | } |
@@ -972,8 +972,7 @@ discard block |
||
972 | 972 | <?php echo get_lang('Error'); ?>!<br /> |
973 | 973 | Chamilo <?php echo implode('|', $update_from_version_8).' '.get_lang('HasNotBeenFoundInThatDir'); ?>. |
974 | 974 | </div> |
975 | - <?php } |
|
976 | - else { |
|
975 | + <?php } else { |
|
977 | 976 | echo '<br />'; |
978 | 977 | } |
979 | 978 | ?> |
@@ -1088,7 +1087,10 @@ discard block |
||
1088 | 1087 | <button type="submit" name="step1" class="btn btn-default" onclick="javascript: window.location='index.php'; return false;" value="<?php echo get_lang('Previous'); ?>" > |
1089 | 1088 | <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?> |
1090 | 1089 | </button> |
1091 | - <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) echo 'disabled="disabled"'; ?> > |
|
1090 | + <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) { |
|
1091 | + echo 'disabled="disabled"'; |
|
1092 | +} |
|
1093 | +?> > |
|
1092 | 1094 | <em class="fa fa-forward"> </em> <?php echo get_lang('NewInstallation'); ?> |
1093 | 1095 | </button> |
1094 | 1096 | <input type="hidden" name="is_executable" id="is_executable" value="-" /> |
@@ -1374,7 +1376,7 @@ discard block |
||
1374 | 1376 | <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?> |
1375 | 1377 | </div> |
1376 | 1378 | <div class="col-sm-3"></div> |
1377 | - <?php }else{ ?> |
|
1379 | + <?php } else{ ?> |
|
1378 | 1380 | <div class="col-sm-5"> |
1379 | 1381 | <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /> |
1380 | 1382 | </div> |
@@ -1388,7 +1390,7 @@ discard block |
||
1388 | 1390 | <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?> |
1389 | 1391 | </div> |
1390 | 1392 | <div class="col-sm-3"></div> |
1391 | - <?php }else{ ?> |
|
1393 | + <?php } else{ ?> |
|
1392 | 1394 | <div class="col-sm-5"> |
1393 | 1395 | <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /> |
1394 | 1396 | </div> |
@@ -1470,9 +1472,12 @@ discard block |
||
1470 | 1472 | Database port: <strong><?php echo $manager->getConnection()->getPort(); ?></strong><br/> |
1471 | 1473 | Database driver: <strong><?php echo $manager->getConnection()->getDriver()->getName(); ?></strong><br/> |
1472 | 1474 | </div> |
1473 | - <?php else: ?> |
|
1475 | + <?php else { |
|
1476 | + : ?> |
|
1474 | 1477 | <div id="db_status" class="alert alert-danger"> |
1475 | - <p><?php echo get_lang('FailedConectionDatabase'); ?></strong></p> |
|
1478 | + <p><?php echo get_lang('FailedConectionDatabase'); |
|
1479 | +} |
|
1480 | +?></strong></p> |
|
1476 | 1481 | <code><?php echo $database_exists_text ?></code> |
1477 | 1482 | </div> |
1478 | 1483 | <?php endif; ?> |
@@ -260,10 +260,11 @@ |
||
260 | 260 | <td colspan="3" align="center"> |
261 | 261 | <br /> |
262 | 262 | <?php |
263 | - if(isset($_GET['add'])) |
|
264 | - echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('AddCoursesToURL').'</button>'; |
|
265 | - else |
|
266 | - echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('EditCoursesToURL').'</button>'; |
|
263 | + if(isset($_GET['add'])) { |
|
264 | + echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('AddCoursesToURL').'</button>'; |
|
265 | + } else { |
|
266 | + echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('EditCoursesToURL').'</button>'; |
|
267 | + } |
|
267 | 268 | ?> |
268 | 269 | </td> |
269 | 270 | </tr> |
@@ -509,7 +509,9 @@ discard block |
||
509 | 509 | if ($file != '.' && $file != '..') { |
510 | 510 | $filetype = 'file'; |
511 | 511 | |
512 | - if (is_dir($course_sys_dir.$new_dir.$file)) $filetype = 'folder'; |
|
512 | + if (is_dir($course_sys_dir.$new_dir.$file)) { |
|
513 | + $filetype = 'folder'; |
|
514 | + } |
|
513 | 515 | |
514 | 516 | // TODO: RENAMING FILES CAN BE VERY DANGEROUS AICC-WISE, avoid that as much as possible! |
515 | 517 | //$safe_file = api_replace_dangerous_char($file, 'strict'); |
@@ -908,37 +910,43 @@ discard block |
||
908 | 910 | if ($enclosed && $data{$i+1} == $enclosure) { |
909 | 911 | $fldval .= $chr; |
910 | 912 | ++$i; // Skip the next character. |
911 | - } else |
|
912 | - $enclosed = !$enclosed; |
|
913 | + } else { |
|
914 | + $enclosed = !$enclosed; |
|
915 | + } |
|
913 | 916 | break; |
914 | 917 | case $delim: |
915 | 918 | if (!$enclosed) { |
916 | 919 | $ret_array[$linecount][$fldcount++] = $fldval; |
917 | 920 | $fldval = ''; |
918 | - } else |
|
919 | - $fldval .= $chr; |
|
921 | + } else { |
|
922 | + $fldval .= $chr; |
|
923 | + } |
|
920 | 924 | break; |
921 | 925 | case "\r": |
922 | - if (!$enclosed&&$data{$i+1} == "\n") |
|
923 | - continue; |
|
926 | + if (!$enclosed&&$data{$i+1} == "\n") { |
|
927 | + continue; |
|
928 | + } |
|
924 | 929 | case "\n": |
925 | 930 | if (!$enclosed) { |
926 | 931 | $ret_array[$linecount++][$fldcount] = $fldval; |
927 | 932 | $fldcount = 0; |
928 | 933 | $fldval = ''; |
929 | - } else |
|
930 | - $fldval .= $chr; |
|
934 | + } else { |
|
935 | + $fldval .= $chr; |
|
936 | + } |
|
931 | 937 | break; |
932 | 938 | case "\\r": |
933 | - if (!$enclosed&&$data{$i+1} == "\\n") |
|
934 | - continue; |
|
939 | + if (!$enclosed&&$data{$i+1} == "\\n") { |
|
940 | + continue; |
|
941 | + } |
|
935 | 942 | case "\\n": |
936 | 943 | if (!$enclosed) { |
937 | 944 | $ret_array[$linecount++][$fldcount] = $fldval; |
938 | 945 | $fldcount = 0; |
939 | 946 | $fldval = ''; |
940 | - } else |
|
941 | - $fldval .= $chr; |
|
947 | + } else { |
|
948 | + $fldval .= $chr; |
|
949 | + } |
|
942 | 950 | break; |
943 | 951 | default: |
944 | 952 | $fldval .= $chr; |
@@ -135,8 +135,8 @@ discard block |
||
135 | 135 | ?> |
136 | 136 | <div id="message" style="display: none"> |
137 | 137 | <?php |
138 | - if(!empty($message)) |
|
139 | - Display::display_normal_message($message) |
|
138 | + if(!empty($message)) { |
|
139 | + Display::display_normal_message($message) |
|
140 | 140 | ?> |
141 | 141 | </div> |
142 | 142 | |
@@ -150,7 +150,9 @@ discard block |
||
150 | 150 | </div> |
151 | 151 | <div class="row"> |
152 | 152 | <div class="col-md-5"> |
153 | - <?php Display::display_icon('screenshot_ppt2lp.jpg', get_lang('Ppt2lp'), array('class'=>'img-responsive')); ?> |
|
153 | + <?php Display::display_icon('screenshot_ppt2lp.jpg', get_lang('Ppt2lp'), array('class'=>'img-responsive')); |
|
154 | + } |
|
155 | + ?> |
|
154 | 156 | </div> |
155 | 157 | <div class="col-md-7"> |
156 | 158 | <form method="POST" class="form-horizontal" action="<?php echo api_get_self(); ?>"> |