Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M3P2 HTML Generator
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
12
Issues
12
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
M3P2
M3P2 HTML Generator
Commits
61e1db84
Commit
61e1db84
authored
Apr 28, 2021
by
Administrator
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: warn when lessons are misconfigured
parent
72670270
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
m3-p2.php
user/plugins/m3-p2/m3-p2.php
+10
-3
No files found.
user/plugins/m3-p2/m3-p2.php
View file @
61e1db84
...
@@ -223,7 +223,7 @@ class M3P2Plugin extends Plugin
...
@@ -223,7 +223,7 @@ class M3P2Plugin extends Plugin
$uri
=
$this
->
grav
[
'uri'
];
$uri
=
$this
->
grav
[
'uri'
];
// var_dump($uri); // best doc ftw
// var_dump($uri); // best doc ftw
// GRAV's routing makes us
e
hook 404 pages and do the URL match ourselves
// GRAV's routing makes us hook 404 pages and do the URL match ourselves
if
(
"lessons"
!=
$uri
->
paths
(
0
))
{
if
(
"lessons"
!=
$uri
->
paths
(
0
))
{
return
;
// perhaps not
return
;
// perhaps not
}
}
...
@@ -239,8 +239,6 @@ class M3P2Plugin extends Plugin
...
@@ -239,8 +239,6 @@ class M3P2Plugin extends Plugin
/** @var Pages $pages */
/** @var Pages $pages */
$pages
=
$this
->
grav
[
'pages'
];
$pages
=
$this
->
grav
[
'pages'
];
// VERY inefficient : TODO: cache this
// $target_pages = $pages->all()->filter(function ($p) use ($lesson_slug) {
$target_pages
=
array_filter
(
$pages
->
instances
(),
function
(
Page
$p
)
use
(
$lesson_slug
)
{
$target_pages
=
array_filter
(
$pages
->
instances
(),
function
(
Page
$p
)
use
(
$lesson_slug
)
{
$page_config
=
$p
->
header
();
$page_config
=
$p
->
header
();
...
@@ -249,6 +247,15 @@ class M3P2Plugin extends Plugin
...
@@ -249,6 +247,15 @@ class M3P2Plugin extends Plugin
}
}
foreach
(
$page_config
->
lessons
as
$lesson
)
{
foreach
(
$page_config
->
lessons
as
$lesson
)
{
if
(
!
isset
(
$lesson
[
'slug'
]))
{
trigger_error
(
"Misconfigured lesson (missing a slug) in "
.
(
$p
->
filePathClean
()),
E_USER_WARNING
);
continue
;
}
if
(
$lesson_slug
==
$lesson
[
'slug'
])
{
if
(
$lesson_slug
==
$lesson
[
'slug'
])
{
return
true
;
// yay, this page is part of the lesson
return
true
;
// yay, this page is part of the lesson
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment