@@ -29,14 +29,16 @@ |
||
| 29 | 29 | {
|
| 30 | 30 | foreach ( $_POST as $key => $value ) |
| 31 | 31 | {
|
| 32 | - if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) |
|
| 33 | - continue; |
|
| 32 | + if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) { |
|
| 33 | + continue; |
|
| 34 | + } |
|
| 34 | 35 | |
| 35 | - if ( get_magic_quotes_gpc() ) |
|
| 36 | - $value = htmlspecialchars( stripslashes((string)$value) ); |
|
| 37 | - else |
|
| 38 | - $value = htmlspecialchars( (string)$value ); |
|
| 39 | -?> |
|
| 36 | + if ( get_magic_quotes_gpc() ) { |
|
| 37 | + $value = htmlspecialchars( stripslashes((string)$value) ); |
|
| 38 | + } else { |
|
| 39 | + $value = htmlspecialchars( (string)$value ); |
|
| 40 | + } |
|
| 41 | + ?> |
|
| 40 | 42 | <tr> |
| 41 | 43 | <th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th> |
| 42 | 44 | <td><pre class="samples"><?php echo $value; ?></pre></td> |
@@ -133,7 +133,9 @@ discard block |
||
| 133 | 133 | $key = $headers[$f]; |
| 134 | 134 | if (preg_match('/\|/', $key)) { |
| 135 | 135 | list($plugin, $variable) = explode('|', str_replace('plugin_', '', $key)); |
| 136 | - if (empty($variable)) die("Key error in CSV : $key "); |
|
| 136 | + if (empty($variable)) { |
|
| 137 | + die("Key error in CSV : $key "); |
|
| 138 | + } |
|
| 137 | 139 | if (!isset($vnode->$plugin)) { |
| 138 | 140 | $vnode->$plugin = new StdClass(); |
| 139 | 141 | } |
@@ -170,8 +172,13 @@ discard block |
||
| 170 | 172 | static $first = true; |
| 171 | 173 | |
| 172 | 174 | // We may have a risk the BOM is present on first line |
| 173 | - if ($resetfirst) $first = true; |
|
| 174 | - if (!isset($textlib)) $textlib = new textlib(); // Singleton |
|
| 175 | + if ($resetfirst) { |
|
| 176 | + $first = true; |
|
| 177 | + } |
|
| 178 | + if (!isset($textlib)) { |
|
| 179 | + $textlib = new textlib(); |
|
| 180 | + } |
|
| 181 | + // Singleton |
|
| 175 | 182 | $text = $textlib->trim_utf8_bom($text); |
| 176 | 183 | $first = false; |
| 177 | 184 | |
@@ -65,8 +65,7 @@ |
||
| 65 | 65 | if (strpos($filename, "svg")){ |
| 66 | 66 | $new_sizes['width'] = 60; |
| 67 | 67 | $new_sizes['height'] = 60; |
| 68 | - } |
|
| 69 | - else { |
|
| 68 | + } else { |
|
| 70 | 69 | $new_sizes = api_resize_image($image, 60, 60); |
| 71 | 70 | } |
| 72 | 71 | |
@@ -1701,7 +1701,9 @@ discard block |
||
| 1701 | 1701 | } |
| 1702 | 1702 | |
| 1703 | 1703 | global $_course; |
| 1704 | - if ($_course == '-1') $_course = array(); |
|
| 1704 | + if ($_course == '-1') { |
|
| 1705 | + $_course = array(); |
|
| 1706 | + } |
|
| 1705 | 1707 | return $_course; |
| 1706 | 1708 | } |
| 1707 | 1709 | |
@@ -4154,18 +4156,21 @@ discard block |
||
| 4154 | 4156 | switch ($lang_type) { |
| 4155 | 4157 | case 'platform_lang': |
| 4156 | 4158 | $temp_lang = api_get_setting('platformLanguage'); |
| 4157 | - if (!empty($temp_lang)) |
|
| 4158 | - $return = $temp_lang; |
|
| 4159 | + if (!empty($temp_lang)) { |
|
| 4160 | + $return = $temp_lang; |
|
| 4161 | + } |
|
| 4159 | 4162 | break; |
| 4160 | 4163 | case 'user_profil_lang': |
| 4161 | 4164 | $_user = api_get_user_info(); |
| 4162 | 4165 | |
| 4163 | - if (isset($_user['language']) && !empty($_user['language'])) |
|
| 4164 | - $return = $_user['language']; |
|
| 4166 | + if (isset($_user['language']) && !empty($_user['language'])) { |
|
| 4167 | + $return = $_user['language']; |
|
| 4168 | + } |
|
| 4165 | 4169 | break; |
| 4166 | 4170 | case 'user_selected_lang': |
| 4167 | - if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice'])) |
|
| 4168 | - $return = $_SESSION['user_language_choice']; |
|
| 4171 | + if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice'])) { |
|
| 4172 | + $return = $_SESSION['user_language_choice']; |
|
| 4173 | + } |
|
| 4169 | 4174 | break; |
| 4170 | 4175 | case 'course_lang': |
| 4171 | 4176 | global $_course; |
@@ -5434,8 +5439,7 @@ discard block |
||
| 5434 | 5439 | $is_courseAdmin = false; |
| 5435 | 5440 | $is_courseCoach = true; |
| 5436 | 5441 | $is_sessionAdmin = false; |
| 5437 | - } |
|
| 5438 | - elseif ($row[0]['session_admin_id'] == $userid) { |
|
| 5442 | + } elseif ($row[0]['session_admin_id'] == $userid) { |
|
| 5439 | 5443 | $is_courseMember = false; |
| 5440 | 5444 | $is_courseTutor = false; |
| 5441 | 5445 | $is_courseAdmin = false; |
@@ -5778,8 +5782,7 @@ discard block |
||
| 5778 | 5782 | elseif (isset($_ENV['OS'])) { |
| 5779 | 5783 | // Sometimes $_ENV['OS'] may not be present (bugs?) |
| 5780 | 5784 | $os = $_ENV['OS']; |
| 5781 | - } |
|
| 5782 | - elseif (defined('PHP_OS')) { |
|
| 5785 | + } elseif (defined('PHP_OS')) { |
|
| 5783 | 5786 | // PHP_OS means on which OS PHP was compiled, this is why |
| 5784 | 5787 | // using PHP_OS is the last choice for detection. |
| 5785 | 5788 | $os = PHP_OS; |
@@ -5843,12 +5846,10 @@ discard block |
||
| 5843 | 5846 | if ($delta_width > $delta_height) { |
| 5844 | 5847 | $result['width'] = ceil($image_width * $resize_factor_height); |
| 5845 | 5848 | $result['height'] = ceil($image_height * $resize_factor_height); |
| 5846 | - } |
|
| 5847 | - elseif ($delta_width < $delta_height) { |
|
| 5849 | + } elseif ($delta_width < $delta_height) { |
|
| 5848 | 5850 | $result['width'] = ceil($image_width * $resize_factor_width); |
| 5849 | 5851 | $result['height'] = ceil($image_height * $resize_factor_width); |
| 5850 | - } |
|
| 5851 | - else { |
|
| 5852 | + } else { |
|
| 5852 | 5853 | $result['width'] = ceil($target_width); |
| 5853 | 5854 | $result['height'] = ceil($target_height); |
| 5854 | 5855 | } |
@@ -6629,7 +6630,9 @@ discard block |
||
| 6629 | 6630 | } |
| 6630 | 6631 | $ip = trim($ip1); |
| 6631 | 6632 | } |
| 6632 | - if (!empty($debug)) error_log('Real IP: '.$ip); |
|
| 6633 | + if (!empty($debug)) { |
|
| 6634 | + error_log('Real IP: '.$ip); |
|
| 6635 | + } |
|
| 6633 | 6636 | return $ip; |
| 6634 | 6637 | } |
| 6635 | 6638 | |
@@ -289,8 +289,9 @@ |
||
| 289 | 289 | |
| 290 | 290 | if ($start_date != '' || $end_date != '') { |
| 291 | 291 | $sql .= " HAVING "; |
| 292 | - if ($start_date != '') |
|
| 293 | - $sql .= " access_date >= '$start_date' "; |
|
| 292 | + if ($start_date != '') { |
|
| 293 | + $sql .= " access_date >= '$start_date' "; |
|
| 294 | + } |
|
| 294 | 295 | if ($end_date != '') { |
| 295 | 296 | $sql = ($start_date == '') ? $sql : ($sql . " AND "); |
| 296 | 297 | $sql .= " access_date <= '$end_date' "; |
@@ -250,8 +250,7 @@ |
||
| 250 | 250 | case RESULT_DISABLE_SHOW_SCORE_ONLY: |
| 251 | 251 | if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) { |
| 252 | 252 | $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score')); |
| 253 | - } |
|
| 254 | - else { |
|
| 253 | + } else { |
|
| 255 | 254 | $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details')); |
| 256 | 255 | } |
| 257 | 256 | break; |
@@ -362,9 +362,10 @@ |
||
| 362 | 362 | |
| 363 | 363 | if ($inATest) { |
| 364 | 364 | echo '<div class="actions">'; |
| 365 | - if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion']) || isset($_GET['myid'])) |
|
| 366 | - echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'. |
|
| 365 | + if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion']) || isset($_GET['myid'])) { |
|
| 366 | + echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'. |
|
| 367 | 367 | Display::return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>'; |
| 368 | + } |
|
| 368 | 369 | |
| 369 | 370 | if (!isset($_GET['hotspotadmin']) && !isset($_GET['newQuestion']) && !isset($_GET['myid']) && !isset($_GET['editQuestion'])) { |
| 370 | 371 | echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq().'">'. |
@@ -146,15 +146,17 @@ discard block |
||
| 146 | 146 | $list_dest = $item_list[2]; |
| 147 | 147 | $url = $item_list[3]; |
| 148 | 148 | |
| 149 | - if ($try == 0) |
|
| 150 | - $try_result = 0; |
|
| 151 | - else |
|
| 152 | - $try_result = 1; |
|
| 149 | + if ($try == 0) { |
|
| 150 | + $try_result = 0; |
|
| 151 | + } else { |
|
| 152 | + $try_result = 1; |
|
| 153 | + } |
|
| 153 | 154 | |
| 154 | - if ($url == 0) |
|
| 155 | - $url_result = ''; |
|
| 156 | - else |
|
| 157 | - $url_result = $url; |
|
| 155 | + if ($url == 0) { |
|
| 156 | + $url_result = ''; |
|
| 157 | + } else { |
|
| 158 | + $url_result = $url; |
|
| 159 | + } |
|
| 158 | 160 | |
| 159 | 161 | $temp_scenario['url' . $i] = $url_result; |
| 160 | 162 | $temp_scenario['try' . $i] = $try_result; |
@@ -343,8 +345,9 @@ discard block |
||
| 343 | 345 | } |
| 344 | 346 | } |
| 345 | 347 | |
| 346 | - if (empty($try)) |
|
| 347 | - $try=0; |
|
| 348 | + if (empty($try)) { |
|
| 349 | + $try=0; |
|
| 350 | + } |
|
| 348 | 351 | |
| 349 | 352 | if (empty($lp)) { |
| 350 | 353 | $lp=0; |
@@ -18,10 +18,11 @@ |
||
| 18 | 18 | $lang = urldecode($_GET['lang']); |
| 19 | 19 | if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) { |
| 20 | 20 | //$lang = str_replace($search,$replace,urldecode($_GET['lang'])); |
| 21 | - if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) |
|
| 22 | - $hotspot_lang_file .= $lang . '/hotspot.inc.php'; |
|
| 23 | - else |
|
| 24 | - $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
| 21 | + if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) { |
|
| 22 | + $hotspot_lang_file .= $lang . '/hotspot.inc.php'; |
|
| 23 | + } else { |
|
| 24 | + $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
| 25 | + } |
|
| 25 | 26 | } else { |
| 26 | 27 | $hotspot_lang_file .= 'english/hotspot.inc.php'; |
| 27 | 28 | } |