Skip to content

Commit 6161cb8

Browse files
committed
Add file check before requiring
1 parent 1072cf7 commit 6161cb8

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

classes/snippets.php

+21-11
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,39 @@ class snippets {
3232
*/
3333
public static function get_snippet($key, $domain = 'theme_boost_union') {
3434
global $CFG;
35-
if ('theme_boost_union' == $domain) {
36-
return require_once($CFG->dirroot . sprintf('/theme/boost_union/snippets/builtin/%s.php', $key));
35+
36+
if ('theme_boost_union' === $domain) {
37+
$filename = $CFG->dirroot . sprintf('/theme/boost_union/snippets/builtin/%s.php', $key);
38+
39+
return file_exists($filename) ? require_once($filename) : false;
3740
}
41+
42+
return false;
3843
}
3944

4045
/**
41-
* Compose snippets data.
46+
* Compose snippets file data to record.
4247
* @param mixed $data
4348
* @return array
4449
*/
4550
public static function compose_snippets_data($snippetrecordset) {
4651
$snippets = [];
52+
4753
foreach ($snippetrecordset as $snippetrecord) {
4854
if ('code' === $snippetrecord->source) {
49-
$snippetcontent = self::get_snippet($snippetrecord->key, $snippetrecord->domain);
50-
$snippetrecord->title = $snippetcontent['title'];
51-
$snippetrecord->description = $snippetcontent['description'];
52-
$snippetrecord->css = $snippetcontent['css'];
53-
$snippetrecord->goal = $snippetcontent['goal'];
54-
$snippetrecord->scope = $snippetcontent['scope'];
55-
$snippets[] = $snippetrecord;
55+
// Get snippet file content.
56+
if ($snippetcontent = self::get_snippet($snippetrecord->key, $snippetrecord->domain)) {
57+
// Compose snippet file data.
58+
$snippetrecord->title = $snippetcontent['title'];
59+
$snippetrecord->description = $snippetcontent['description'];
60+
$snippetrecord->css = $snippetcontent['css'];
61+
$snippetrecord->goal = $snippetcontent['goal'];
62+
$snippetrecord->scope = $snippetcontent['scope'];
63+
$snippets[] = $snippetrecord;
64+
}
5665
}
5766
}
67+
5868
return $snippets;
5969
}
6070

@@ -67,7 +77,7 @@ public static function get_enabled_snippet_css() {
6777

6878
// Compose SQL base query.
6979
$sql = "SELECT *
70-
FROM m_theme_boost_union_snippets
80+
FROM {theme_boost_union_snippets} s
7181
WHERE enabled = '1'
7282
ORDER BY sortorder";
7383

classes/table/snippets_overview.php

+1
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ public function query_db($pagesize, $useinitialsbar = true) {
234234
// Get records.
235235
$data = $DB->get_recordset_sql($sql);
236236

237+
// Compose snippet data to record.
237238
$this->rawdata = snippets::compose_snippets_data($data);
238239
}
239240

0 commit comments

Comments
 (0)