@@ -1009,8 +1009,9 @@ discard block |
||
| 1009 | 1009 | $blog_post_actions .= '</a>'; |
| 1010 | 1010 | } |
| 1011 | 1011 | |
| 1012 | - if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) |
|
| 1013 | - $rating_select = Blog::display_rating_form('post',$blog_id,$post_id); |
|
| 1012 | + if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) { |
|
| 1013 | + $rating_select = Blog::display_rating_form('post',$blog_id,$post_id); |
|
| 1014 | + } |
|
| 1014 | 1015 | |
| 1015 | 1016 | $blog_post_text=stripslashes($blog_post_text); |
| 1016 | 1017 | |
@@ -1654,8 +1655,9 @@ discard block |
||
| 1654 | 1655 | |
| 1655 | 1656 | $arrPermissions = array(); |
| 1656 | 1657 | |
| 1657 | - while ($row = Database::fetch_array($result)) |
|
| 1658 | - $arrPermissions[] = $row['action']; |
|
| 1658 | + while ($row = Database::fetch_array($result)) { |
|
| 1659 | + $arrPermissions[] = $row['action']; |
|
| 1660 | + } |
|
| 1659 | 1661 | |
| 1660 | 1662 | echo '<tr>'; |
| 1661 | 1663 | echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ': </td>'; |
@@ -2332,8 +2334,9 @@ discard block |
||
| 2332 | 2334 | //Handle leap year |
| 2333 | 2335 | $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); |
| 2334 | 2336 | |
| 2335 | - if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) |
|
| 2336 | - $numberofdays[2] = 29; |
|
| 2337 | + if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) { |
|
| 2338 | + $numberofdays[2] = 29; |
|
| 2339 | + } |
|
| 2337 | 2340 | |
| 2338 | 2341 | //Get the first day of the month |
| 2339 | 2342 | $dayone = getdate(mktime(0, 0, 0, $month, 1, $year)); |
@@ -2363,8 +2366,9 @@ discard block |
||
| 2363 | 2366 | if( Database::num_rows($result) > 0) { |
| 2364 | 2367 | while($blog_post = Database::fetch_array($result)) { |
| 2365 | 2368 | // If the day of this post is not yet in the array, add it. |
| 2366 | - if (!in_array($blog_post['post_day'], $posts)) |
|
| 2367 | - $posts[] = $blog_post['post_day']; |
|
| 2369 | + if (!in_array($blog_post['post_day'], $posts)) { |
|
| 2370 | + $posts[] = $blog_post['post_day']; |
|
| 2371 | + } |
|
| 2368 | 2372 | } |
| 2369 | 2373 | } |
| 2370 | 2374 | |
@@ -2403,8 +2407,9 @@ discard block |
||
| 2403 | 2407 | |
| 2404 | 2408 | echo "<tr>\n"; |
| 2405 | 2409 | |
| 2406 | - for($ii = 1; $ii < 8; $ii ++) |
|
| 2407 | - echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>"; |
|
| 2410 | + for($ii = 1; $ii < 8; $ii ++) { |
|
| 2411 | + echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>"; |
|
| 2412 | + } |
|
| 2408 | 2413 | |
| 2409 | 2414 | echo "</tr>"; |
| 2410 | 2415 | |
@@ -2414,8 +2419,9 @@ discard block |
||
| 2414 | 2419 | while ($curday <= $numberofdays[$month]) { |
| 2415 | 2420 | echo "<tr>"; |
| 2416 | 2421 | for ($ii = 0; $ii < 7; $ii ++) { |
| 2417 | - if (($curday == -1) && ($ii == $startdayofweek)) |
|
| 2418 | - $curday = 1; |
|
| 2422 | + if (($curday == -1) && ($ii == $startdayofweek)) { |
|
| 2423 | + $curday = 1; |
|
| 2424 | + } |
|
| 2419 | 2425 | |
| 2420 | 2426 | if (($curday > 0) && ($curday <= $numberofdays[$month])) { |
| 2421 | 2427 | $bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\""; |
@@ -2429,10 +2435,11 @@ discard block |
||
| 2429 | 2435 | echo "<td " . $class.">"; |
| 2430 | 2436 | |
| 2431 | 2437 | // If there are posts on this day, create a filter link. |
| 2432 | - if(in_array($curday, $posts)) |
|
| 2433 | - echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>'; |
|
| 2434 | - else |
|
| 2435 | - echo $dayheader; |
|
| 2438 | + if(in_array($curday, $posts)) { |
|
| 2439 | + echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>'; |
|
| 2440 | + } else { |
|
| 2441 | + echo $dayheader; |
|
| 2442 | + } |
|
| 2436 | 2443 | |
| 2437 | 2444 | if (count($tasks) > 0) { |
| 2438 | 2445 | if (isset($tasks[$curday]) && is_array($tasks[$curday])) { |
@@ -2446,8 +2453,9 @@ discard block |
||
| 2446 | 2453 | |
| 2447 | 2454 | echo "</td>"; |
| 2448 | 2455 | $curday ++; |
| 2449 | - } else |
|
| 2450 | - echo "<td> </td>"; |
|
| 2456 | + } else { |
|
| 2457 | + echo "<td> </td>"; |
|
| 2458 | + } |
|
| 2451 | 2459 | } |
| 2452 | 2460 | echo "</tr>"; |
| 2453 | 2461 | } |
@@ -1152,68 +1152,52 @@ |
||
| 1152 | 1152 | if (stripos($this->_agent, 'windows') !== false) |
| 1153 | 1153 | { |
| 1154 | 1154 | $this->_platform = self::PLATFORM_WINDOWS; |
| 1155 | - } |
|
| 1156 | - else if (stripos($this->_agent, 'iPad') !== false) |
|
| 1155 | + } else if (stripos($this->_agent, 'iPad') !== false) |
|
| 1157 | 1156 | { |
| 1158 | 1157 | $this->_platform = self::PLATFORM_IPAD; |
| 1159 | - } |
|
| 1160 | - else if (stripos($this->_agent, 'iPod') !== false) |
|
| 1158 | + } else if (stripos($this->_agent, 'iPod') !== false) |
|
| 1161 | 1159 | { |
| 1162 | 1160 | $this->_platform = self::PLATFORM_IPOD; |
| 1163 | - } |
|
| 1164 | - else if (stripos($this->_agent, 'iPhone') !== false) |
|
| 1161 | + } else if (stripos($this->_agent, 'iPhone') !== false) |
|
| 1165 | 1162 | { |
| 1166 | 1163 | $this->_platform = self::PLATFORM_IPHONE; |
| 1167 | - } |
|
| 1168 | - elseif (stripos($this->_agent, 'mac') !== false) |
|
| 1164 | + } elseif (stripos($this->_agent, 'mac') !== false) |
|
| 1169 | 1165 | { |
| 1170 | 1166 | $this->_platform = self::PLATFORM_APPLE; |
| 1171 | - } |
|
| 1172 | - elseif (stripos($this->_agent, 'android') !== false) |
|
| 1167 | + } elseif (stripos($this->_agent, 'android') !== false) |
|
| 1173 | 1168 | { |
| 1174 | 1169 | $this->_platform = self::PLATFORM_ANDROID; |
| 1175 | - } |
|
| 1176 | - elseif (stripos($this->_agent, 'linux') !== false) |
|
| 1170 | + } elseif (stripos($this->_agent, 'linux') !== false) |
|
| 1177 | 1171 | { |
| 1178 | 1172 | $this->_platform = self::PLATFORM_LINUX; |
| 1179 | - } |
|
| 1180 | - else if (stripos($this->_agent, 'Nokia') !== false) |
|
| 1173 | + } else if (stripos($this->_agent, 'Nokia') !== false) |
|
| 1181 | 1174 | { |
| 1182 | 1175 | $this->_platform = self::PLATFORM_NOKIA; |
| 1183 | - } |
|
| 1184 | - else if (stripos($this->_agent, 'BlackBerry') !== false) |
|
| 1176 | + } else if (stripos($this->_agent, 'BlackBerry') !== false) |
|
| 1185 | 1177 | { |
| 1186 | 1178 | $this->_platform = self::PLATFORM_BLACKBERRY; |
| 1187 | - } |
|
| 1188 | - elseif (stripos($this->_agent, 'FreeBSD') !== false) |
|
| 1179 | + } elseif (stripos($this->_agent, 'FreeBSD') !== false) |
|
| 1189 | 1180 | { |
| 1190 | 1181 | $this->_platform = self::PLATFORM_FREEBSD; |
| 1191 | - } |
|
| 1192 | - elseif (stripos($this->_agent, 'OpenBSD') !== false) |
|
| 1182 | + } elseif (stripos($this->_agent, 'OpenBSD') !== false) |
|
| 1193 | 1183 | { |
| 1194 | 1184 | $this->_platform = self::PLATFORM_OPENBSD; |
| 1195 | - } |
|
| 1196 | - elseif (stripos($this->_agent, 'NetBSD') !== false) |
|
| 1185 | + } elseif (stripos($this->_agent, 'NetBSD') !== false) |
|
| 1197 | 1186 | { |
| 1198 | 1187 | $this->_platform = self::PLATFORM_NETBSD; |
| 1199 | - } |
|
| 1200 | - elseif (stripos($this->_agent, 'OpenSolaris') !== false) |
|
| 1188 | + } elseif (stripos($this->_agent, 'OpenSolaris') !== false) |
|
| 1201 | 1189 | { |
| 1202 | 1190 | $this->_platform = self::PLATFORM_OPENSOLARIS; |
| 1203 | - } |
|
| 1204 | - elseif (stripos($this->_agent, 'SunOS') !== false) |
|
| 1191 | + } elseif (stripos($this->_agent, 'SunOS') !== false) |
|
| 1205 | 1192 | { |
| 1206 | 1193 | $this->_platform = self::PLATFORM_SUNOS; |
| 1207 | - } |
|
| 1208 | - elseif (stripos($this->_agent, 'OS\/2') !== false) |
|
| 1194 | + } elseif (stripos($this->_agent, 'OS\/2') !== false) |
|
| 1209 | 1195 | { |
| 1210 | 1196 | $this->_platform = self::PLATFORM_OS2; |
| 1211 | - } |
|
| 1212 | - elseif (stripos($this->_agent, 'BeOS') !== false) |
|
| 1197 | + } elseif (stripos($this->_agent, 'BeOS') !== false) |
|
| 1213 | 1198 | { |
| 1214 | 1199 | $this->_platform = self::PLATFORM_BEOS; |
| 1215 | - } |
|
| 1216 | - elseif (stripos($this->_agent, 'win') !== false) |
|
| 1200 | + } elseif (stripos($this->_agent, 'win') !== false) |
|
| 1217 | 1201 | { |
| 1218 | 1202 | $this->_platform = self::PLATFORM_WINDOWS; |
| 1219 | 1203 | } |
@@ -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> |
@@ -866,7 +866,7 @@ discard block |
||
| 866 | 866 | |
| 867 | 867 | if ($progress === null) { |
| 868 | 868 | $progress = '0%'; |
| 869 | - } else { |
|
| 869 | + } else { |
|
| 870 | 870 | $any_result = true; |
| 871 | 871 | } |
| 872 | 872 | |
@@ -896,7 +896,9 @@ discard block |
||
| 896 | 896 | $start_time = '-'; |
| 897 | 897 | } |
| 898 | 898 | |
| 899 | - if (!empty($total_time)) $any_result = true; |
|
| 899 | + if (!empty($total_time)) { |
|
| 900 | + $any_result = true; |
|
| 901 | + } |
|
| 900 | 902 | |
| 901 | 903 | // Quiz in lp |
| 902 | 904 | $score = Tracking::get_avg_student_score( |
@@ -1089,10 +1091,11 @@ discard block |
||
| 1089 | 1091 | $result_last_attempt = Database::query($sql); |
| 1090 | 1092 | if (Database :: num_rows($result_last_attempt) > 0) { |
| 1091 | 1093 | $id_last_attempt = Database :: result($result_last_attempt, 0, 0); |
| 1092 | - if ($count_attempts > 0) |
|
| 1093 | - echo '<a href="../exercice/exercise_show.php?id=' . $id_last_attempt . '&cidReq='.$course_code.'&session_id='.$sessionId.'&student='.$student_id.'&origin='.(empty($origin)?'tracking':$origin).'"> |
|
| 1094 | + if ($count_attempts > 0) { |
|
| 1095 | + echo '<a href="../exercice/exercise_show.php?id=' . $id_last_attempt . '&cidReq='.$course_code.'&session_id='.$sessionId.'&student='.$student_id.'&origin='.(empty($origin)?'tracking':$origin).'"> |
|
| 1094 | 1096 | '.Display::return_icon('quiz.gif').' |
| 1095 | 1097 | </a>'; |
| 1098 | + } |
|
| 1096 | 1099 | } |
| 1097 | 1100 | echo '</td>'; |
| 1098 | 1101 | |
@@ -13,7 +13,9 @@ discard block |
||
| 13 | 13 | $use_anonymous = true; |
| 14 | 14 | |
| 15 | 15 | $debug = 0; |
| 16 | -if ($debug > 0) error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0); |
|
| 16 | +if ($debug > 0) { |
|
| 17 | + error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0); |
|
| 18 | +} |
|
| 17 | 19 | |
| 18 | 20 | // Language files that needs to be included. |
| 19 | 21 | if (isset($_GET['action'])) { |
@@ -231,10 +233,14 @@ discard block |
||
| 231 | 233 | // If refresh is set, we regenerate the oLP object from the database (kind of flush). |
| 232 | 234 | Session::erase('refresh'); |
| 233 | 235 | $myrefresh = 1; |
| 234 | - if ($debug > 0) error_log('New LP - Refresh asked', 0); |
|
| 235 | -} |
|
| 236 | + if ($debug > 0) { |
|
| 237 | + error_log('New LP - Refresh asked', 0); |
|
| 238 | + } |
|
| 239 | + } |
|
| 236 | 240 | |
| 237 | -if ($debug > 0) error_log('New LP - Passed refresh check', 0); |
|
| 241 | +if ($debug > 0) { |
|
| 242 | + error_log('New LP - Passed refresh check', 0); |
|
| 243 | +} |
|
| 238 | 244 | |
| 239 | 245 | if (!empty($_REQUEST['dialog_box'])) { |
| 240 | 246 | $dialog_box = stripslashes(urldecode($_REQUEST['dialog_box'])); |
@@ -244,17 +250,23 @@ discard block |
||
| 244 | 250 | $lp_found = false; |
| 245 | 251 | |
| 246 | 252 | if (isset($_SESSION['lpobject'])) { |
| 247 | - if ($debug > 0) error_log('New LP - SESSION[lpobject] is defined', 0); |
|
| 253 | + if ($debug > 0) { |
|
| 254 | + error_log('New LP - SESSION[lpobject] is defined', 0); |
|
| 255 | + } |
|
| 248 | 256 | $oLP = unserialize($_SESSION['lpobject']); |
| 249 | 257 | if (isset($oLP) && is_object($oLP)) { |
| 250 | - if ($debug > 0) error_log('New LP - oLP is object', 0); |
|
| 258 | + if ($debug > 0) { |
|
| 259 | + error_log('New LP - oLP is object', 0); |
|
| 260 | + } |
|
| 251 | 261 | if ($myrefresh == 1 OR |
| 252 | 262 | empty($oLP->cc) OR |
| 253 | 263 | $oLP->cc != api_get_course_id() OR |
| 254 | 264 | $oLP->lp_view_session_id != $session_id OR |
| 255 | 265 | $oLP->scorm_debug == '1' |
| 256 | 266 | ) { |
| 257 | - if ($debug > 0) error_log('New LP - Course has changed, discard lp object', 0); |
|
| 267 | + if ($debug > 0) { |
|
| 268 | + error_log('New LP - Course has changed, discard lp object', 0); |
|
| 269 | + } |
|
| 258 | 270 | if ($myrefresh == 1) { $myrefresh_id = $oLP->get_id(); } |
| 259 | 271 | $oLP = null; |
| 260 | 272 | Session::erase('oLP'); |
@@ -268,13 +280,19 @@ discard block |
||
| 268 | 280 | |
| 269 | 281 | $course_id = api_get_course_int_id(); |
| 270 | 282 | |
| 271 | -if ($debug>0) error_log('New LP - Passed data remains check', 0); |
|
| 283 | +if ($debug>0) { |
|
| 284 | + error_log('New LP - Passed data remains check', 0); |
|
| 285 | +} |
|
| 272 | 286 | |
| 273 | 287 | if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) { |
| 274 | - if ($debug > 0) error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0); |
|
| 288 | + if ($debug > 0) { |
|
| 289 | + error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0); |
|
| 290 | + } |
|
| 275 | 291 | // Regenerate a new lp object? Not always as some pages don't need the object (like upload?) |
| 276 | 292 | if (!empty($_REQUEST['lp_id']) || !empty($myrefresh_id)) { |
| 277 | - if ($debug > 0) error_log('New LP - lp_id is defined', 0); |
|
| 293 | + if ($debug > 0) { |
|
| 294 | + error_log('New LP - lp_id is defined', 0); |
|
| 295 | + } |
|
| 278 | 296 | // Select the lp in the database and check which type it is (scorm/dokeos/aicc) to generate the |
| 279 | 297 | // right object. |
| 280 | 298 | if (!empty($_REQUEST['lp_id'])) { |
@@ -286,49 +304,67 @@ discard block |
||
| 286 | 304 | $lp_table = Database::get_course_table(TABLE_LP_MAIN); |
| 287 | 305 | if (is_numeric($lp_id)) { |
| 288 | 306 | $sel = "SELECT lp_type FROM $lp_table WHERE c_id = $course_id AND id = $lp_id"; |
| 289 | - if ($debug > 0) error_log('New LP - querying '.$sel, 0); |
|
| 307 | + if ($debug > 0) { |
|
| 308 | + error_log('New LP - querying '.$sel, 0); |
|
| 309 | + } |
|
| 290 | 310 | $res = Database::query($sel); |
| 291 | 311 | |
| 292 | 312 | if (Database::num_rows($res)) { |
| 293 | 313 | $row = Database::fetch_array($res); |
| 294 | 314 | $type = $row['lp_type']; |
| 295 | - if ($debug > 0) error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 315 | + if ($debug > 0) { |
|
| 316 | + error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 317 | + } |
|
| 296 | 318 | switch ($type) { |
| 297 | 319 | case 1: |
| 298 | - if ($debug > 0) error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 320 | + if ($debug > 0) { |
|
| 321 | + error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 322 | + } |
|
| 299 | 323 | |
| 300 | 324 | $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id()); |
| 301 | 325 | if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); } |
| 302 | 326 | break; |
| 303 | 327 | case 2: |
| 304 | - if ($debug > 0) error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 328 | + if ($debug > 0) { |
|
| 329 | + error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 330 | + } |
|
| 305 | 331 | $oLP = new scorm(api_get_course_id(), $lp_id, api_get_user_id()); |
| 306 | 332 | if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); } |
| 307 | 333 | break; |
| 308 | 334 | case 3: |
| 309 | - if ($debug > 0) error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 335 | + if ($debug > 0) { |
|
| 336 | + error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 337 | + } |
|
| 310 | 338 | $oLP = new aicc(api_get_course_id(), $lp_id, api_get_user_id()); |
| 311 | 339 | if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); } |
| 312 | 340 | break; |
| 313 | 341 | default: |
| 314 | - if ($debug > 0) error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 342 | + if ($debug > 0) { |
|
| 343 | + error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 344 | + } |
|
| 315 | 345 | $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id()); |
| 316 | 346 | if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); } |
| 317 | 347 | break; |
| 318 | 348 | } |
| 319 | 349 | } |
| 320 | 350 | } else { |
| 321 | - if ($debug > 0) error_log('New LP - Request[lp_id] is not numeric', 0); |
|
| 351 | + if ($debug > 0) { |
|
| 352 | + error_log('New LP - Request[lp_id] is not numeric', 0); |
|
| 353 | + } |
|
| 322 | 354 | } |
| 323 | 355 | } else { |
| 324 | - if ($debug > 0) error_log('New LP - Request[lp_id] and refresh_id were empty', 0); |
|
| 356 | + if ($debug > 0) { |
|
| 357 | + error_log('New LP - Request[lp_id] and refresh_id were empty', 0); |
|
| 358 | + } |
|
| 325 | 359 | } |
| 326 | 360 | if ($lp_found) { |
| 327 | 361 | $_SESSION['oLP'] = $oLP; |
| 328 | 362 | } |
| 329 | 363 | } |
| 330 | 364 | |
| 331 | -if ($debug > 0) error_log('New LP - Passed oLP creation check', 0); |
|
| 365 | +if ($debug > 0) { |
|
| 366 | + error_log('New LP - Passed oLP creation check', 0); |
|
| 367 | +} |
|
| 332 | 368 | |
| 333 | 369 | $is_allowed_to_edit = api_is_allowed_to_edit(false, true, false, false); |
| 334 | 370 | |
@@ -372,11 +408,15 @@ discard block |
||
| 372 | 408 | if (!$is_allowed_to_edit) { |
| 373 | 409 | api_not_allowed(true); |
| 374 | 410 | } |
| 375 | - if ($debug > 0) error_log('New LP - add item action triggered', 0); |
|
| 411 | + if ($debug > 0) { |
|
| 412 | + error_log('New LP - add item action triggered', 0); |
|
| 413 | + } |
|
| 376 | 414 | |
| 377 | 415 | if (!$lp_found) { |
| 378 | 416 | //check if the learnpath ID was defined, otherwise send back to list |
| 379 | - if ($debug > 0) error_log('New LP - No learnpath given for add item', 0); |
|
| 417 | + if ($debug > 0) { |
|
| 418 | + error_log('New LP - No learnpath given for add item', 0); |
|
| 419 | + } |
|
| 380 | 420 | require 'lp_list.php'; |
| 381 | 421 | } else { |
| 382 | 422 | $_SESSION['refresh'] = 1; |
@@ -450,11 +490,15 @@ discard block |
||
| 450 | 490 | if (!$is_allowed_to_edit) { |
| 451 | 491 | api_not_allowed(true); |
| 452 | 492 | } |
| 453 | - if ($debug > 0) error_log('New LP - add audio action triggered', 0); |
|
| 493 | + if ($debug > 0) { |
|
| 494 | + error_log('New LP - add audio action triggered', 0); |
|
| 495 | + } |
|
| 454 | 496 | |
| 455 | 497 | if (!$lp_found) { |
| 456 | 498 | //check if the learnpath ID was defined, otherwise send back to list |
| 457 | - if ($debug > 0) error_log('New LP - No learnpath given for add audio', 0); |
|
| 499 | + if ($debug > 0) { |
|
| 500 | + error_log('New LP - No learnpath given for add audio', 0); |
|
| 501 | + } |
|
| 458 | 502 | require 'lp_list.php'; |
| 459 | 503 | } else { |
| 460 | 504 | $_SESSION['refresh'] = 1; |
@@ -528,7 +572,9 @@ discard block |
||
| 528 | 572 | if (!$is_allowed_to_edit) { |
| 529 | 573 | api_not_allowed(true); |
| 530 | 574 | } |
| 531 | - if ($debug > 0) error_log('New LP - add_lp action triggered', 0); |
|
| 575 | + if ($debug > 0) { |
|
| 576 | + error_log('New LP - add_lp action triggered', 0); |
|
| 577 | + } |
|
| 532 | 578 | if (isset($_REQUEST['lp_name']) && !empty($_REQUEST['lp_name'])) { |
| 533 | 579 | $_REQUEST['lp_name'] = trim($_REQUEST['lp_name']); |
| 534 | 580 | $_SESSION['refresh'] = 1; |
@@ -587,9 +633,10 @@ discard block |
||
| 587 | 633 | if (!$is_allowed_to_edit) { |
| 588 | 634 | api_not_allowed(true); |
| 589 | 635 | } |
| 590 | - if ($debug > 0) error_log('New LP - admin_view action triggered', 0); |
|
| 591 | - if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; } |
|
| 592 | - else { |
|
| 636 | + if ($debug > 0) { |
|
| 637 | + error_log('New LP - admin_view action triggered', 0); |
|
| 638 | + } |
|
| 639 | + if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; } else { |
|
| 593 | 640 | $_SESSION['refresh'] = 1; |
| 594 | 641 | require 'lp_admin_view.php'; |
| 595 | 642 | } |
@@ -599,9 +646,10 @@ discard block |
||
| 599 | 646 | if (!$is_allowed_to_edit) { |
| 600 | 647 | api_not_allowed(true); |
| 601 | 648 | } |
| 602 | - if ($debug > 0) error_log('New LP - auto_launch action triggered', 0); |
|
| 603 | - if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; } |
|
| 604 | - else { |
|
| 649 | + if ($debug > 0) { |
|
| 650 | + error_log('New LP - auto_launch action triggered', 0); |
|
| 651 | + } |
|
| 652 | + if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; } else { |
|
| 605 | 653 | $_SESSION['oLP']->set_autolaunch($_GET['lp_id'], $_GET['status']); |
| 606 | 654 | require 'lp_list.php'; |
| 607 | 655 | exit; |
@@ -612,10 +660,11 @@ discard block |
||
| 612 | 660 | if (!$is_allowed_to_edit) { |
| 613 | 661 | api_not_allowed(true); |
| 614 | 662 | } |
| 615 | - if ($debug > 0) error_log('New LP - build action triggered', 0); |
|
| 663 | + if ($debug > 0) { |
|
| 664 | + error_log('New LP - build action triggered', 0); |
|
| 665 | + } |
|
| 616 | 666 | |
| 617 | - if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; } |
|
| 618 | - else { |
|
| 667 | + if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; } else { |
|
| 619 | 668 | $_SESSION['refresh'] = 1; |
| 620 | 669 | //require 'lp_build.php'; |
| 621 | 670 | $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id); |
@@ -627,10 +676,11 @@ discard block |
||
| 627 | 676 | if (!$is_allowed_to_edit) { |
| 628 | 677 | api_not_allowed(true); |
| 629 | 678 | } |
| 630 | - if ($debug > 0) error_log('New LP - edit item action triggered', 0); |
|
| 679 | + if ($debug > 0) { |
|
| 680 | + error_log('New LP - edit item action triggered', 0); |
|
| 681 | + } |
|
| 631 | 682 | |
| 632 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; } |
|
| 633 | - else { |
|
| 683 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; } else { |
|
| 634 | 684 | $_SESSION['refresh'] = 1; |
| 635 | 685 | if (isset($_POST['submit_button']) && !empty($post_title)) { |
| 636 | 686 | |
@@ -680,9 +730,10 @@ discard block |
||
| 680 | 730 | if (!$is_allowed_to_edit) { |
| 681 | 731 | api_not_allowed(true); |
| 682 | 732 | } |
| 683 | - if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0); |
|
| 684 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } |
|
| 685 | - else { |
|
| 733 | + if ($debug > 0) { |
|
| 734 | + error_log('New LP - edit item prereq action triggered', 0); |
|
| 735 | + } |
|
| 736 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else { |
|
| 686 | 737 | if (isset($_POST['submit_button'])) { |
| 687 | 738 | //Updating the lp.modified_on |
| 688 | 739 | $_SESSION['oLP']->set_modified_on(); |
@@ -710,9 +761,10 @@ discard block |
||
| 710 | 761 | if (!$is_allowed_to_edit) { |
| 711 | 762 | api_not_allowed(true); |
| 712 | 763 | } |
| 713 | - if ($debug > 0) error_log('New LP - move item action triggered', 0); |
|
| 714 | - if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; } |
|
| 715 | - else { |
|
| 764 | + if ($debug > 0) { |
|
| 765 | + error_log('New LP - move item action triggered', 0); |
|
| 766 | + } |
|
| 767 | + if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; } else { |
|
| 716 | 768 | $_SESSION['refresh'] = 1; |
| 717 | 769 | if (isset($_POST['submit_button'])) { |
| 718 | 770 | //Updating the lp.modified_on |
@@ -745,7 +797,9 @@ discard block |
||
| 745 | 797 | if (!$is_allowed_to_edit) { |
| 746 | 798 | api_not_allowed(true); |
| 747 | 799 | } |
| 748 | - if ($debug > 0) error_log('New LP - view_item action triggered', 0); |
|
| 800 | + if ($debug > 0) { |
|
| 801 | + error_log('New LP - view_item action triggered', 0); |
|
| 802 | + } |
|
| 749 | 803 | if (!$lp_found) { |
| 750 | 804 | error_log('New LP - No learnpath given for view item', 0); require 'lp_list.php'; |
| 751 | 805 | } else { |
@@ -757,7 +811,9 @@ discard block |
||
| 757 | 811 | if (!$is_allowed_to_edit) { |
| 758 | 812 | api_not_allowed(true); |
| 759 | 813 | } |
| 760 | - if ($debug > 0) error_log('New LP - upload action triggered', 0); |
|
| 814 | + if ($debug > 0) { |
|
| 815 | + error_log('New LP - upload action triggered', 0); |
|
| 816 | + } |
|
| 761 | 817 | $cwdir = getcwd(); |
| 762 | 818 | require 'lp_upload.php'; |
| 763 | 819 | // Reinit current working directory as many functions in upload change it. |
@@ -774,9 +830,10 @@ discard block |
||
| 774 | 830 | api_not_allowed(true); |
| 775 | 831 | } |
| 776 | 832 | |
| 777 | - if ($debug > 0) error_log('New LP - export action triggered', 0); |
|
| 778 | - if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; } |
|
| 779 | - else { |
|
| 833 | + if ($debug > 0) { |
|
| 834 | + error_log('New LP - export action triggered', 0); |
|
| 835 | + } |
|
| 836 | + if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; } else { |
|
| 780 | 837 | $_SESSION['oLP']->copy(); |
| 781 | 838 | } |
| 782 | 839 | require 'lp_list.php'; |
@@ -789,9 +846,10 @@ discard block |
||
| 789 | 846 | if ($hideScormExportLink === 'true') { |
| 790 | 847 | api_not_allowed(true); |
| 791 | 848 | } |
| 792 | - if ($debug > 0) error_log('New LP - export action triggered', 0); |
|
| 793 | - if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; } |
|
| 794 | - else { |
|
| 849 | + if ($debug > 0) { |
|
| 850 | + error_log('New LP - export action triggered', 0); |
|
| 851 | + } |
|
| 852 | + if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; } else { |
|
| 795 | 853 | $_SESSION['oLP']->scorm_export(); |
| 796 | 854 | exit(); |
| 797 | 855 | //require 'lp_list.php'; |
@@ -806,7 +864,9 @@ discard block |
||
| 806 | 864 | api_not_allowed(true); |
| 807 | 865 | } |
| 808 | 866 | |
| 809 | - if ($debug > 0) error_log('New LP - export action triggered', 0); |
|
| 867 | + if ($debug > 0) { |
|
| 868 | + error_log('New LP - export action triggered', 0); |
|
| 869 | + } |
|
| 810 | 870 | if (!$lp_found) { error_log('New LP - No learnpath given for export_to_pdf', 0); require 'lp_list.php'; |
| 811 | 871 | } else { |
| 812 | 872 | $result = $_SESSION['oLP']->scorm_export_to_pdf($_GET['lp_id']); |
@@ -820,9 +880,10 @@ discard block |
||
| 820 | 880 | if (!$is_allowed_to_edit) { |
| 821 | 881 | api_not_allowed(true); |
| 822 | 882 | } |
| 823 | - if ($debug > 0) error_log('New LP - delete action triggered', 0); |
|
| 824 | - if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; } |
|
| 825 | - else { |
|
| 883 | + if ($debug > 0) { |
|
| 884 | + error_log('New LP - delete action triggered', 0); |
|
| 885 | + } |
|
| 886 | + if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; } else { |
|
| 826 | 887 | $_SESSION['refresh'] = 1; |
| 827 | 888 | $_SESSION['oLP']->delete(null, $_GET['lp_id'], 'remove'); |
| 828 | 889 | Session::erase('oLP'); |
@@ -834,9 +895,10 @@ discard block |
||
| 834 | 895 | if (!$is_allowed_to_edit) { |
| 835 | 896 | api_not_allowed(true); |
| 836 | 897 | } |
| 837 | - if ($debug > 0) error_log('New LP - visibility action triggered', 0); |
|
| 838 | - if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; } |
|
| 839 | - else { |
|
| 898 | + if ($debug > 0) { |
|
| 899 | + error_log('New LP - visibility action triggered', 0); |
|
| 900 | + } |
|
| 901 | + if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; } else { |
|
| 840 | 902 | learnpath::toggle_visibility($_REQUEST['lp_id'], $_REQUEST['new_status']); |
| 841 | 903 | require 'lp_list.php'; |
| 842 | 904 | } |
@@ -846,9 +908,10 @@ discard block |
||
| 846 | 908 | if (!$is_allowed_to_edit) { |
| 847 | 909 | api_not_allowed(true); |
| 848 | 910 | } |
| 849 | - if ($debug > 0) error_log('New LP - publish action triggered', 0); |
|
| 850 | - if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; } |
|
| 851 | - else { |
|
| 911 | + if ($debug > 0) { |
|
| 912 | + error_log('New LP - publish action triggered', 0); |
|
| 913 | + } |
|
| 914 | + if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; } else { |
|
| 852 | 915 | learnpath::toggle_publish($_REQUEST['lp_id'], $_REQUEST['new_status']); |
| 853 | 916 | require 'lp_list.php'; |
| 854 | 917 | } |
@@ -858,7 +921,9 @@ discard block |
||
| 858 | 921 | if (!$is_allowed_to_edit) { |
| 859 | 922 | api_not_allowed(true); |
| 860 | 923 | } |
| 861 | - if ($debug > 0) error_log('New LP - publish action triggered', 0); |
|
| 924 | + if ($debug > 0) { |
|
| 925 | + error_log('New LP - publish action triggered', 0); |
|
| 926 | + } |
|
| 862 | 927 | if (!$lp_found) { |
| 863 | 928 | error_log('New LP - No learnpath given for publish', 0); |
| 864 | 929 | require 'lp_list.php'; |
@@ -872,7 +937,9 @@ discard block |
||
| 872 | 937 | if (!$is_allowed_to_edit) { |
| 873 | 938 | api_not_allowed(true); |
| 874 | 939 | } |
| 875 | - if ($debug > 0) error_log('New LP - publish action triggered', 0); |
|
| 940 | + if ($debug > 0) { |
|
| 941 | + error_log('New LP - publish action triggered', 0); |
|
| 942 | + } |
|
| 876 | 943 | if (!$lp_found) { |
| 877 | 944 | error_log('New LP - No learnpath given for publish', 0); |
| 878 | 945 | require 'lp_list.php'; |
@@ -885,9 +952,10 @@ discard block |
||
| 885 | 952 | if (!$is_allowed_to_edit) { |
| 886 | 953 | api_not_allowed(true); |
| 887 | 954 | } |
| 888 | - if ($debug > 0) error_log('New LP - edit action triggered', 0); |
|
| 889 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } |
|
| 890 | - else { |
|
| 955 | + if ($debug > 0) { |
|
| 956 | + error_log('New LP - edit action triggered', 0); |
|
| 957 | + } |
|
| 958 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else { |
|
| 891 | 959 | $_SESSION['refresh'] = 1; |
| 892 | 960 | require 'lp_edit.php'; |
| 893 | 961 | } |
@@ -896,9 +964,10 @@ discard block |
||
| 896 | 964 | if (!$is_allowed_to_edit) { |
| 897 | 965 | api_not_allowed(true); |
| 898 | 966 | } |
| 899 | - if ($debug > 0) error_log('New LP - update_lp action triggered', 0); |
|
| 900 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } |
|
| 901 | - else { |
|
| 967 | + if ($debug > 0) { |
|
| 968 | + error_log('New LP - update_lp action triggered', 0); |
|
| 969 | + } |
|
| 970 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else { |
|
| 902 | 971 | $_SESSION['refresh'] = 1; |
| 903 | 972 | $lp_name = Security::remove_XSS($_REQUEST['lp_name']); |
| 904 | 973 | $_SESSION['oLP']->set_name($lp_name); |
@@ -965,8 +1034,9 @@ discard block |
||
| 965 | 1034 | ); |
| 966 | 1035 | $extraFieldValue->saveFieldValues($_REQUEST); |
| 967 | 1036 | |
| 968 | - if ($_FILES['lp_preview_image']['size'] > 0) |
|
| 969 | - $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']); |
|
| 1037 | + if ($_FILES['lp_preview_image']['size'] > 0) { |
|
| 1038 | + $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']); |
|
| 1039 | + } |
|
| 970 | 1040 | |
| 971 | 1041 | if (api_get_setting('search_enabled') === 'true') { |
| 972 | 1042 | require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; |
@@ -1006,9 +1076,10 @@ discard block |
||
| 1006 | 1076 | if (!$is_allowed_to_edit) { |
| 1007 | 1077 | api_not_allowed(true); |
| 1008 | 1078 | } |
| 1009 | - if ($debug > 0) error_log('New LP - add sub item action triggered', 0); |
|
| 1010 | - if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; } |
|
| 1011 | - else { |
|
| 1079 | + if ($debug > 0) { |
|
| 1080 | + error_log('New LP - add sub item action triggered', 0); |
|
| 1081 | + } |
|
| 1082 | + if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; } else { |
|
| 1012 | 1083 | $_SESSION['refresh'] = 1; |
| 1013 | 1084 | if (!empty($_REQUEST['parent_item_id'])) { |
| 1014 | 1085 | $_SESSION['from_learnpath']='yes'; |
@@ -1024,9 +1095,10 @@ discard block |
||
| 1024 | 1095 | if (!$is_allowed_to_edit) { |
| 1025 | 1096 | api_not_allowed(true); |
| 1026 | 1097 | } |
| 1027 | - if ($debug > 0) error_log('New LP - delete item action triggered', 0); |
|
| 1028 | - if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; } |
|
| 1029 | - else { |
|
| 1098 | + if ($debug > 0) { |
|
| 1099 | + error_log('New LP - delete item action triggered', 0); |
|
| 1100 | + } |
|
| 1101 | + if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; } else { |
|
| 1030 | 1102 | //$_SESSION['refresh'] = 1; |
| 1031 | 1103 | if (!empty($_REQUEST['id'])) { |
| 1032 | 1104 | $_SESSION['oLP']->delete_item($_REQUEST['id']); |
@@ -1041,9 +1113,10 @@ discard block |
||
| 1041 | 1113 | if (!$is_allowed_to_edit) { |
| 1042 | 1114 | api_not_allowed(true); |
| 1043 | 1115 | } |
| 1044 | - if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0); |
|
| 1045 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } |
|
| 1046 | - else { |
|
| 1116 | + if ($debug > 0) { |
|
| 1117 | + error_log('New LP - edit item prereq action triggered', 0); |
|
| 1118 | + } |
|
| 1119 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else { |
|
| 1047 | 1120 | if (!empty($_REQUEST['id']) && !empty($_REQUEST['submit_item'])) { |
| 1048 | 1121 | $_SESSION['refresh'] = 1; |
| 1049 | 1122 | $_SESSION['oLP']->edit_item_prereq($_REQUEST['id'], $_REQUEST['prereq']); |
@@ -1052,64 +1125,80 @@ discard block |
||
| 1052 | 1125 | } |
| 1053 | 1126 | break; |
| 1054 | 1127 | case 'restart': |
| 1055 | - if ($debug > 0) error_log('New LP - restart action triggered', 0); |
|
| 1056 | - if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; } |
|
| 1057 | - else { |
|
| 1128 | + if ($debug > 0) { |
|
| 1129 | + error_log('New LP - restart action triggered', 0); |
|
| 1130 | + } |
|
| 1131 | + if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; } else { |
|
| 1058 | 1132 | $_SESSION['oLP']->restart(); |
| 1059 | 1133 | require 'lp_view.php'; |
| 1060 | 1134 | } |
| 1061 | 1135 | break; |
| 1062 | 1136 | case 'last': |
| 1063 | - if ($debug > 0) error_log('New LP - last action triggered', 0); |
|
| 1064 | - if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; } |
|
| 1065 | - else { |
|
| 1137 | + if ($debug > 0) { |
|
| 1138 | + error_log('New LP - last action triggered', 0); |
|
| 1139 | + } |
|
| 1140 | + if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; } else { |
|
| 1066 | 1141 | $_SESSION['oLP']->last(); |
| 1067 | 1142 | require 'lp_view.php'; |
| 1068 | 1143 | } |
| 1069 | 1144 | break; |
| 1070 | 1145 | case 'first': |
| 1071 | - if ($debug > 0) error_log('New LP - first action triggered', 0); |
|
| 1072 | - if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; } |
|
| 1073 | - else { |
|
| 1146 | + if ($debug > 0) { |
|
| 1147 | + error_log('New LP - first action triggered', 0); |
|
| 1148 | + } |
|
| 1149 | + if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; } else { |
|
| 1074 | 1150 | $_SESSION['oLP']->first(); |
| 1075 | 1151 | require 'lp_view.php'; |
| 1076 | 1152 | } |
| 1077 | 1153 | break; |
| 1078 | 1154 | case 'next': |
| 1079 | - if ($debug > 0) error_log('New LP - next action triggered', 0); |
|
| 1080 | - if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; } |
|
| 1081 | - else { |
|
| 1155 | + if ($debug > 0) { |
|
| 1156 | + error_log('New LP - next action triggered', 0); |
|
| 1157 | + } |
|
| 1158 | + if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; } else { |
|
| 1082 | 1159 | $_SESSION['oLP']->next(); |
| 1083 | 1160 | require 'lp_view.php'; |
| 1084 | 1161 | } |
| 1085 | 1162 | break; |
| 1086 | 1163 | case 'previous': |
| 1087 | - if ($debug > 0) error_log('New LP - previous action triggered', 0); |
|
| 1088 | - if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; } |
|
| 1089 | - else { |
|
| 1164 | + if ($debug > 0) { |
|
| 1165 | + error_log('New LP - previous action triggered', 0); |
|
| 1166 | + } |
|
| 1167 | + if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; } else { |
|
| 1090 | 1168 | $_SESSION['oLP']->previous(); |
| 1091 | 1169 | require 'lp_view.php'; |
| 1092 | 1170 | } |
| 1093 | 1171 | break; |
| 1094 | 1172 | case 'content': |
| 1095 | - if ($debug > 0) error_log('New LP - content action triggered', 0); |
|
| 1096 | - if ($debug > 0) error_log('New LP - Item id is '.intval($_GET['item_id']), 0); |
|
| 1173 | + if ($debug > 0) { |
|
| 1174 | + error_log('New LP - content action triggered', 0); |
|
| 1175 | + } |
|
| 1176 | + if ($debug > 0) { |
|
| 1177 | + error_log('New LP - Item id is '.intval($_GET['item_id']), 0); |
|
| 1178 | + } |
|
| 1097 | 1179 | if (!$lp_found) { |
| 1098 | 1180 | error_log('New LP - No learnpath given for content', 0); |
| 1099 | 1181 | require 'lp_list.php'; |
| 1100 | 1182 | } else { |
| 1101 | - if ($debug > 0) error_log('New LP - save_last()', 0); |
|
| 1183 | + if ($debug > 0) { |
|
| 1184 | + error_log('New LP - save_last()', 0); |
|
| 1185 | + } |
|
| 1102 | 1186 | $_SESSION['oLP']->save_last(); |
| 1103 | - if ($debug > 0) error_log('New LP - set_current_item()', 0); |
|
| 1187 | + if ($debug > 0) { |
|
| 1188 | + error_log('New LP - set_current_item()', 0); |
|
| 1189 | + } |
|
| 1104 | 1190 | $_SESSION['oLP']->set_current_item($_GET['item_id']); |
| 1105 | - if ($debug > 0) error_log('New LP - start_current_item()', 0); |
|
| 1191 | + if ($debug > 0) { |
|
| 1192 | + error_log('New LP - start_current_item()', 0); |
|
| 1193 | + } |
|
| 1106 | 1194 | $_SESSION['oLP']->start_current_item(); |
| 1107 | 1195 | require 'lp_content.php'; |
| 1108 | 1196 | } |
| 1109 | 1197 | break; |
| 1110 | 1198 | case 'view': |
| 1111 | - if ($debug > 0) |
|
| 1112 | - error_log('New LP - view action triggered', 0); |
|
| 1199 | + if ($debug > 0) { |
|
| 1200 | + error_log('New LP - view action triggered', 0); |
|
| 1201 | + } |
|
| 1113 | 1202 | if (!$lp_found) { |
| 1114 | 1203 | error_log('New LP - No learnpath given for view', 0); |
| 1115 | 1204 | require 'lp_list.php'; |
@@ -1122,17 +1211,19 @@ discard block |
||
| 1122 | 1211 | } |
| 1123 | 1212 | break; |
| 1124 | 1213 | case 'save': |
| 1125 | - if ($debug > 0) error_log('New LP - save action triggered', 0); |
|
| 1126 | - if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; } |
|
| 1127 | - else { |
|
| 1214 | + if ($debug > 0) { |
|
| 1215 | + error_log('New LP - save action triggered', 0); |
|
| 1216 | + } |
|
| 1217 | + if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; } else { |
|
| 1128 | 1218 | $_SESSION['oLP']->save_item(); |
| 1129 | 1219 | require 'lp_save.php'; |
| 1130 | 1220 | } |
| 1131 | 1221 | break; |
| 1132 | 1222 | case 'stats': |
| 1133 | - if ($debug > 0) error_log('New LP - stats action triggered', 0); |
|
| 1134 | - if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } |
|
| 1135 | - else { |
|
| 1223 | + if ($debug > 0) { |
|
| 1224 | + error_log('New LP - stats action triggered', 0); |
|
| 1225 | + } |
|
| 1226 | + if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else { |
|
| 1136 | 1227 | $_SESSION['oLP']->save_current(); |
| 1137 | 1228 | $_SESSION['oLP']->save_last(); |
| 1138 | 1229 | $output = require 'lp_stats.php'; |
@@ -1140,7 +1231,9 @@ discard block |
||
| 1140 | 1231 | } |
| 1141 | 1232 | break; |
| 1142 | 1233 | case 'list': |
| 1143 | - if ($debug > 0) error_log('New LP - list action triggered', 0); |
|
| 1234 | + if ($debug > 0) { |
|
| 1235 | + error_log('New LP - list action triggered', 0); |
|
| 1236 | + } |
|
| 1144 | 1237 | if ($lp_found) { |
| 1145 | 1238 | $_SESSION['refresh'] = 1; |
| 1146 | 1239 | $_SESSION['oLP']->save_last(); |
@@ -1149,7 +1242,9 @@ discard block |
||
| 1149 | 1242 | break; |
| 1150 | 1243 | case 'mode': |
| 1151 | 1244 | // Switch between fullscreen and embedded mode. |
| 1152 | - if ($debug > 0) error_log('New LP - mode change triggered', 0); |
|
| 1245 | + if ($debug > 0) { |
|
| 1246 | + error_log('New LP - mode change triggered', 0); |
|
| 1247 | + } |
|
| 1153 | 1248 | $mode = $_REQUEST['mode']; |
| 1154 | 1249 | if ($mode == 'fullscreen') { |
| 1155 | 1250 | $_SESSION['oLP']->mode = 'fullscreen'; |
@@ -1163,7 +1258,9 @@ discard block |
||
| 1163 | 1258 | require 'lp_view.php'; |
| 1164 | 1259 | break; |
| 1165 | 1260 | case 'switch_view_mode': |
| 1166 | - if ($debug > 0) error_log('New LP - switch_view_mode action triggered', 0); |
|
| 1261 | + if ($debug > 0) { |
|
| 1262 | + error_log('New LP - switch_view_mode action triggered', 0); |
|
| 1263 | + } |
|
| 1167 | 1264 | if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; } |
| 1168 | 1265 | if (Security::check_token('get')) { |
| 1169 | 1266 | $_SESSION['refresh'] = 1; |
@@ -1172,7 +1269,9 @@ discard block |
||
| 1172 | 1269 | require 'lp_list.php'; |
| 1173 | 1270 | break; |
| 1174 | 1271 | case 'switch_force_commit': |
| 1175 | - if ($debug > 0) error_log('New LP - switch_force_commit action triggered', 0); |
|
| 1272 | + if ($debug > 0) { |
|
| 1273 | + error_log('New LP - switch_force_commit action triggered', 0); |
|
| 1274 | + } |
|
| 1176 | 1275 | if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; } |
| 1177 | 1276 | $_SESSION['refresh'] = 1; |
| 1178 | 1277 | $_SESSION['oLP']->update_default_scorm_commit(); |
@@ -1195,25 +1294,33 @@ discard block |
||
| 1195 | 1294 | break; |
| 1196 | 1295 | */ |
| 1197 | 1296 | case 'switch_attempt_mode': |
| 1198 | - if($debug>0) error_log('New LP - switch_reinit action triggered',0); |
|
| 1297 | + if($debug>0) { |
|
| 1298 | + error_log('New LP - switch_reinit action triggered',0); |
|
| 1299 | + } |
|
| 1199 | 1300 | if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; } |
| 1200 | 1301 | $_SESSION['refresh'] = 1; |
| 1201 | 1302 | $_SESSION['oLP']->switch_attempt_mode(); |
| 1202 | 1303 | require 'lp_list.php'; |
| 1203 | 1304 | break; |
| 1204 | 1305 | case 'switch_scorm_debug': |
| 1205 | - if ($debug > 0) error_log('New LP - switch_scorm_debug action triggered', 0); |
|
| 1306 | + if ($debug > 0) { |
|
| 1307 | + error_log('New LP - switch_scorm_debug action triggered', 0); |
|
| 1308 | + } |
|
| 1206 | 1309 | if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; } |
| 1207 | 1310 | $_SESSION['refresh'] = 1; |
| 1208 | 1311 | $_SESSION['oLP']->update_scorm_debug(); |
| 1209 | 1312 | require 'lp_list.php'; |
| 1210 | 1313 | break; |
| 1211 | 1314 | case 'intro_cmdAdd': |
| 1212 | - if ($debug > 0) error_log('New LP - intro_cmdAdd action triggered', 0); |
|
| 1315 | + if ($debug > 0) { |
|
| 1316 | + error_log('New LP - intro_cmdAdd action triggered', 0); |
|
| 1317 | + } |
|
| 1213 | 1318 | // Add introduction section page. |
| 1214 | 1319 | break; |
| 1215 | 1320 | case 'js_api_refresh': |
| 1216 | - if ($debug > 0) error_log('New LP - js_api_refresh action triggered', 0); |
|
| 1321 | + if ($debug > 0) { |
|
| 1322 | + error_log('New LP - js_api_refresh action triggered', 0); |
|
| 1323 | + } |
|
| 1217 | 1324 | if (!$lp_found) { error_log('New LP - No learnpath given for js_api_refresh', 0); require 'lp_message.php'; } |
| 1218 | 1325 | if (isset($_REQUEST['item_id'])) { |
| 1219 | 1326 | $htmlHeadXtra[] = $_SESSION['oLP']->get_js_info($_REQUEST['item_id']); |
@@ -1221,8 +1328,7 @@ discard block |
||
| 1221 | 1328 | require 'lp_message.php'; |
| 1222 | 1329 | break; |
| 1223 | 1330 | case 'return_to_course_homepage': |
| 1224 | - if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } |
|
| 1225 | - else { |
|
| 1331 | + if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else { |
|
| 1226 | 1332 | $_SESSION['oLP']->save_current(); |
| 1227 | 1333 | $_SESSION['oLP']->save_last(); |
| 1228 | 1334 | $url = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php?id_session='.api_get_session_id(); |
@@ -1240,8 +1346,9 @@ discard block |
||
| 1240 | 1346 | require 'lp_list_search.php'; |
| 1241 | 1347 | break; |
| 1242 | 1348 | case 'impress': |
| 1243 | - if ($debug > 0) |
|
| 1244 | - error_log('New LP - view action triggered', 0); |
|
| 1349 | + if ($debug > 0) { |
|
| 1350 | + error_log('New LP - view action triggered', 0); |
|
| 1351 | + } |
|
| 1245 | 1352 | if (!$lp_found) { |
| 1246 | 1353 | error_log('New LP - No learnpath given for view', 0); |
| 1247 | 1354 | require 'lp_list.php'; |
@@ -1413,15 +1520,19 @@ discard block |
||
| 1413 | 1520 | ]); |
| 1414 | 1521 | break; |
| 1415 | 1522 | default: |
| 1416 | - if ($debug > 0) error_log('New LP - default action triggered', 0); |
|
| 1523 | + if ($debug > 0) { |
|
| 1524 | + error_log('New LP - default action triggered', 0); |
|
| 1525 | + } |
|
| 1417 | 1526 | require 'lp_list.php'; |
| 1418 | 1527 | break; |
| 1419 | 1528 | } |
| 1420 | 1529 | |
| 1421 | 1530 | if (!empty($_SESSION['oLP'])) { |
| 1422 | 1531 | $_SESSION['lpobject'] = serialize($_SESSION['oLP']); |
| 1423 | - if ($debug > 0) error_log('New LP - lpobject is serialized in session', 0); |
|
| 1424 | -} |
|
| 1532 | + if ($debug > 0) { |
|
| 1533 | + error_log('New LP - lpobject is serialized in session', 0); |
|
| 1534 | + } |
|
| 1535 | + } |
|
| 1425 | 1536 | |
| 1426 | 1537 | if (!empty($redirectTo)) { |
| 1427 | 1538 | header("Location: $redirectTo"); |
@@ -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).'exercice/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).'exercice/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).'exercice/exercise.php?'.api_get_cidreq().'">'. |
@@ -269,7 +269,9 @@ discard block |
||
| 269 | 269 | $clock_expired_time = null; |
| 270 | 270 | |
| 271 | 271 | if (empty($exercise_stat_info)) { |
| 272 | - if ($debug) error_log('5 $exercise_stat_info is empty '); |
|
| 272 | + if ($debug) { |
|
| 273 | + error_log('5 $exercise_stat_info is empty '); |
|
| 274 | + } |
|
| 273 | 275 | $total_weight = 0; |
| 274 | 276 | $questionList = $objExercise->get_validated_question_list(); |
| 275 | 277 | foreach ($questionListUncompressed as $question_id) { |
@@ -280,11 +282,17 @@ discard block |
||
| 280 | 282 | if ($time_control) { |
| 281 | 283 | $expected_time = $current_timestamp + $total_seconds; |
| 282 | 284 | |
| 283 | - if ($debug) error_log('5.1. $current_timestamp '.$current_timestamp); |
|
| 284 | - if ($debug) error_log('5.2. $expected_time '.$expected_time); |
|
| 285 | + if ($debug) { |
|
| 286 | + error_log('5.1. $current_timestamp '.$current_timestamp); |
|
| 287 | + } |
|
| 288 | + if ($debug) { |
|
| 289 | + error_log('5.2. $expected_time '.$expected_time); |
|
| 290 | + } |
|
| 285 | 291 | |
| 286 | 292 | $clock_expired_time = api_get_utc_datetime($expected_time); |
| 287 | - if ($debug) error_log('5.3. $expected_time '.$clock_expired_time); |
|
| 293 | + if ($debug) { |
|
| 294 | + error_log('5.3. $expected_time '.$clock_expired_time); |
|
| 295 | + } |
|
| 288 | 296 | |
| 289 | 297 | //Sessions that contain the expired time |
| 290 | 298 | $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time; |
@@ -304,8 +312,10 @@ discard block |
||
| 304 | 312 | $learnpath_item_id, |
| 305 | 313 | $learnpath_item_view_id |
| 306 | 314 | ); |
| 307 | - if ($debug) error_log("5.5 exercise_stat_info[] exists getting exe_id $exe_id"); |
|
| 308 | -} else { |
|
| 315 | + if ($debug) { |
|
| 316 | + error_log("5.5 exercise_stat_info[] exists getting exe_id $exe_id"); |
|
| 317 | + } |
|
| 318 | + } else { |
|
| 309 | 319 | $exe_id = $exercise_stat_info['exe_id']; |
| 310 | 320 | // Remember last question id position. |
| 311 | 321 | $isFirstTime = Session::read('firstTime'); |
@@ -327,8 +337,10 @@ discard block |
||
| 327 | 337 | } |
| 328 | 338 | } |
| 329 | 339 | |
| 330 | - if ($debug) error_log("5 exercise_stat_info[] exists getting exe_id $exe_id "); |
|
| 331 | -} |
|
| 340 | + if ($debug) { |
|
| 341 | + error_log("5 exercise_stat_info[] exists getting exe_id $exe_id "); |
|
| 342 | + } |
|
| 343 | + } |
|
| 332 | 344 | |
| 333 | 345 | $questionListInSession = Session::read('questionList'); |
| 334 | 346 | |
@@ -384,9 +396,15 @@ discard block |
||
| 384 | 396 | * If the expired time is major that zero(0) then the expired time is compute on this time. |
| 385 | 397 | */ |
| 386 | 398 | if ($time_control) { |
| 387 | - if ($debug) error_log('7.1. Time control is enabled'); |
|
| 388 | - if ($debug) error_log('7.2. $current_expired_time_key '.$current_expired_time_key); |
|
| 389 | - if ($debug) error_log('7.3. $_SESSION[expired_time][$current_expired_time_key] '.$_SESSION['expired_time'][$current_expired_time_key]); |
|
| 399 | + if ($debug) { |
|
| 400 | + error_log('7.1. Time control is enabled'); |
|
| 401 | + } |
|
| 402 | + if ($debug) { |
|
| 403 | + error_log('7.2. $current_expired_time_key '.$current_expired_time_key); |
|
| 404 | + } |
|
| 405 | + if ($debug) { |
|
| 406 | + error_log('7.3. $_SESSION[expired_time][$current_expired_time_key] '.$_SESSION['expired_time'][$current_expired_time_key]); |
|
| 407 | + } |
|
| 390 | 408 | |
| 391 | 409 | if (!isset($_SESSION['expired_time'][$current_expired_time_key])) { |
| 392 | 410 | //Timer - Get expired_time for a student |
@@ -473,7 +491,9 @@ discard block |
||
| 473 | 491 | } |
| 474 | 492 | } |
| 475 | 493 | |
| 476 | -if ($debug) error_log('8. Question list loaded '.print_r($questionList, 1)); |
|
| 494 | +if ($debug) { |
|
| 495 | + error_log('8. Question list loaded '.print_r($questionList, 1)); |
|
| 496 | +} |
|
| 477 | 497 | |
| 478 | 498 | //Real question count |
| 479 | 499 | $question_count = 0; |
@@ -973,8 +973,7 @@ discard block |
||
| 973 | 973 | <?php echo get_lang('Error'); ?>!<br /> |
| 974 | 974 | Chamilo <?php echo implode('|', $update_from_version_8).' '.get_lang('HasNotBeenFoundInThatDir'); ?>. |
| 975 | 975 | </div> |
| 976 | - <?php } |
|
| 977 | - else { |
|
| 976 | + <?php } else { |
|
| 978 | 977 | echo '<br />'; |
| 979 | 978 | } |
| 980 | 979 | ?> |
@@ -1060,14 +1059,19 @@ discard block |
||
| 1060 | 1059 | <button type="submit" name="step1" class="btn btn-default" onclick="javascript: window.location='index.php'; return false;" value="<?php echo get_lang('Previous'); ?>" > |
| 1061 | 1060 | <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?> |
| 1062 | 1061 | </button> |
| 1063 | - <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) echo 'disabled="disabled"'; ?> > |
|
| 1062 | + <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) { |
|
| 1063 | + echo 'disabled="disabled"'; |
|
| 1064 | +} |
|
| 1065 | +?> > |
|
| 1064 | 1066 | <em class="fa fa-forward"> </em> <?php echo get_lang('NewInstallation'); ?> |
| 1065 | 1067 | </button> |
| 1066 | 1068 | <input type="hidden" name="is_executable" id="is_executable" value="-" /> |
| 1067 | 1069 | <?php |
| 1068 | 1070 | // Real code |
| 1069 | 1071 | echo '<button type="submit" class="btn btn-default" name="step2_update_8" value="Upgrade from Chamilo 1.9.x"'; |
| 1070 | - if ($error) echo ' disabled="disabled"'; |
|
| 1072 | + if ($error) { |
|
| 1073 | + echo ' disabled="disabled"'; |
|
| 1074 | + } |
|
| 1071 | 1075 | echo ' ><em class="fa fa-forward"> </em> '.get_lang('UpgradeFromLMS19x').'</button>'; |
| 1072 | 1076 | |
| 1073 | 1077 | echo '</p>'; |
@@ -1350,7 +1354,7 @@ discard block |
||
| 1350 | 1354 | <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?> |
| 1351 | 1355 | </div> |
| 1352 | 1356 | <div class="col-sm-3"></div> |
| 1353 | - <?php }else{ ?> |
|
| 1357 | + <?php } else{ ?> |
|
| 1354 | 1358 | <div class="col-sm-5"> |
| 1355 | 1359 | <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /> |
| 1356 | 1360 | </div> |
@@ -1364,7 +1368,7 @@ discard block |
||
| 1364 | 1368 | <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?> |
| 1365 | 1369 | </div> |
| 1366 | 1370 | <div class="col-sm-3"></div> |
| 1367 | - <?php }else{ ?> |
|
| 1371 | + <?php } else{ ?> |
|
| 1368 | 1372 | <div class="col-sm-5"> |
| 1369 | 1373 | <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /> |
| 1370 | 1374 | </div> |
@@ -1446,9 +1450,12 @@ discard block |
||
| 1446 | 1450 | Database port: <strong><?php echo $manager->getConnection()->getPort(); ?></strong><br/> |
| 1447 | 1451 | Database driver: <strong><?php echo $manager->getConnection()->getDriver()->getName(); ?></strong><br/> |
| 1448 | 1452 | </div> |
| 1449 | - <?php else: ?> |
|
| 1453 | + <?php else { |
|
| 1454 | + : ?> |
|
| 1450 | 1455 | <div id="db_status" class="alert alert-danger"> |
| 1451 | - <p><?php echo get_lang('FailedConectionDatabase'); ?></strong></p> |
|
| 1456 | + <p><?php echo get_lang('FailedConectionDatabase'); |
|
| 1457 | +} |
|
| 1458 | +?></strong></p> |
|
| 1452 | 1459 | <code><?php echo $database_exists_text ?></code> |
| 1453 | 1460 | </div> |
| 1454 | 1461 | <?php endif; ?> |
@@ -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 | |