Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge additional changes for 2.6.4 to master #538

Merged
merged 4 commits into from
May 29, 2020
Merged

Merge additional changes for 2.6.4 to master #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f56d4e0
Add check for enforce_scopes before syllabus error
bagofarms May 29, 2020
a334c1c
Add line to remove whitespace between tags
bagofarms May 29, 2020
39c1c06
Merge pull request #537 from ucfopen/issue/529-false-positive-table-h…
bagofarms May 29, 2020
eb144fb
Merge pull request #536 from ucfopen/issue/490-misleading-syllabus-error
bagofarms May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/quail/quail/quail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ function __construct($value, $guideline = 'wcag2aaa', $type = 'string', $reporte
function prepareDOM()
{
$this->prepareValue();
$this->value = preg_replace("/\>\s+\</m", "><", $this->value);
$this->is_valid = @$this->dom->loadHTML('<?xml encoding="utf-8" ?>' . $this->value);
$this->prepareBaseUrl($this->value, $this->type);
}
Expand Down
7 changes: 6 additions & 1 deletion templates/partials/results_scannable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,18 @@
*
* Primary Author Contact: Jacob Bates <[email protected]>
*/
global $oauth2_enforce_scopes;
?>
<h2 class="content-title"><?= ucfirst($content_group->title); ?> <small> <strong><?= count($content_group->items); ?> of <?= $out_of_items; ?> have issues.</strong></small> <span class="proc-time">process time: <?= $time; ?>s</span></h2>

<?php if (isset($content_group->api_error)): ?>
<div class="alert alert-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> There was an error when scanning this section.</div>
<?php elseif (isset($content_group->scope_error)): ?>
<div class="alert alert-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> Due to LMS limitations, UDOIT is unable to scan this section. <a href="https://github.com/ucfopen/UDOIT#faqs" target="_blank">Read our FAQ</a> for more information.</div>
<?php if (isset($oauth2_enforce_scopes) && $oauth2_enforce_scopes): ?>
<div class="alert alert-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> Due to LMS limitations, UDOIT is unable to scan this section. <a href="https://github.com/ucfopen/UDOIT#faqs" target="_blank">Read our FAQ</a> for more information.</div>
<?php else: ?>
<div class="alert alert-danger"><span class="glyphicon glyphicon-ok"></span> No Syllabus found.</div>
<?php endif; ?>
<?php elseif (empty($content_group->items)): ?>
<div class="alert alert-success"><span class="glyphicon glyphicon-ok"></span> No problems were detected in <?= ucfirst($content_group->title); ?>!</div>
<?php else: ?>
Expand Down