Applied fixes from FlintCI

pull/2487/head
Julio Montoya 7 years ago
parent 9293ae2d4e
commit 1cf4c0e487
  1. 2
      main/attendance/attendance_sheet.php
  2. 2
      main/install/index.php
  3. 2
      main/install/install.lib.php
  4. 2
      main/mySpace/myStudents.php
  5. 2
      main/upload/upload.document.php
  6. 2
      main/wiki/wiki.inc.php
  7. 8
      plugin/grading_electronic/generate.php
  8. 2
      src/CoreBundle/Component/Editor/Connector.php
  9. 18
      src/CoreBundle/Controller/IndexController.php

@ -418,7 +418,7 @@ if (api_is_allowed_to_edit(null, true) ||
}
} else {
echo Display::page_header(get_lang('AttendanceSheetReport'));
// View for students ?>
// View for students?>
<?php if (!empty($users_presence)) {
?>
<div>

@ -582,7 +582,7 @@ if (@$_POST['step2']) {
$passForm
);
} elseif (@$_POST['step5']) {
//STEP 6 : LAST CHECK BEFORE INSTALL ?>
//STEP 6 : LAST CHECK BEFORE INSTALL?>
<div class="RequirementHeading">
<h3><?php echo display_step_sequence().get_lang('LastCheck'); ?></h3>
</div>

@ -1147,7 +1147,7 @@ function display_requirements(
$error = true;
}
// And now display the choice buttons (go back or install) ?>
// And now display the choice buttons (go back or install)?>
<p align="center" style="padding-top:15px">
<button type="submit" name="step1" class="btn btn-default" onclick="javascript: window.location='index.php'; return false;" value="<?php echo get_lang('Previous'); ?>" >
<em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?>

@ -1512,7 +1512,7 @@ if (empty($details)) {
</div>
';
// line about other tools ?>
// line about other tools?>
<div class="table-responsive">
<table class="table table-striped table-hover">
<thead>

@ -163,7 +163,7 @@ if (isset($_GET['createdir'])) {
//show the form
echo Display::return_message($new_folder_text, 'normal');
} else {
//give them a link to create a directory ?>
//give them a link to create a directory?>
<p>
<a href="<?php echo api_get_self(); ?>?path=<?php echo $path; ?>&amp;createdir=1">
<?php echo Display::return_icon('new_folder.gif'); ?>

@ -1321,7 +1321,7 @@ class Wiki
).'</a>';
}
//export to print ?>
//export to print?>
<script>
function goprint() {
var a = window.open('', '', 'width=800,height=600');

@ -134,14 +134,14 @@ try {
$student->getId()
);
$exerciseResult = current($exerciseResult);
if (!$exerciseResult) {
continue;
}
$attemptDate = new DateTime($exerciseResult['exe_date'], new DateTimeZone('UTC'));
$dateIsRange = $attemptDate >= $dateStart && $attemptDate <= $dateEnd;
if (!$dateEnd) {
continue;
}
@ -158,7 +158,7 @@ try {
);
/** old method to get the score
$score = Category::getCurrentScore(
$student->getId(),
$gradebook,

@ -345,7 +345,7 @@ class Connector
if (isset($args['target'])) {
$driverName = $elFinder->getVolumeDriverNameByTarget($args['target']);
}
if (isset($args['targets'])) {
foreach ($args['targets'] as $target) {
$driverName = $elFinder->getVolumeDriverNameByTarget($target);

@ -54,7 +54,7 @@ class IndexController extends BaseController
if (api_get_setting('display_categories_on_homepage') == 'true') {
//$template->assign('course_category_block', $pageController->return_courses_in_categories());
}
if (!api_is_anonymous()) {
if (api_is_platform_admin()) {
$pageController->setCourseBlock();
@ -62,16 +62,16 @@ class IndexController extends BaseController
$pageController->return_teacher_link();
}
}
// Hot courses & announcements
$hotCourses = null;
$announcementsBlock = null;
// Navigation links
//$pageController->returnNavigationLinks($template->getNavigationLinks());
$pageController->returnNotice();
$pageController->returnHelp();
if (api_is_platform_admin() || api_is_drh()) {
$pageController->returnSkillsLinks();
}*/
@ -99,7 +99,7 @@ class IndexController extends BaseController
$attribute->setStorageType(AttributeValueInterface::STORAGE_TEXT);
$this->getDoctrine()->getManager()->persist($attribute);
$this->getDoctrine()->getManager()->flush();
$attributeColor = new ExtraField();
$attributeColor->setName('color');
$attributeColor->setVariable('color');
@ -107,19 +107,19 @@ class IndexController extends BaseController
$attributeColor->setStorageType(AttributeValueInterface::STORAGE_TEXT);
$this->getDoctrine()->getManager()->persist($attributeColor);
$this->getDoctrine()->getManager()->flush();
$color = new ExtraFieldValues();
$color->setComment('lol');
$color->setAttribute($attributeColor);
$color->setValue('blue');
$user->addAttribute($color);
$smallSize = new ExtraFieldValues();
$smallSize->setComment('lol');
$smallSize->setAttribute($attribute);
$smallSize->setValue('S');
$user->addAttribute($smallSize);
$userManager->updateUser($user);
*/

Loading…
Cancel
Save