esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Merged in bugfix/MAPG-187-dont-evaluate-asset-paths (pull request #165)

Browse Source 
Bugfix/MAPG-187 dont evaluate asset paths
This commit is contained in:
Bence Pőcze 2020-06-28 17:38:03 +00:00
commit 34f0c92eb5
19 changed files with 74 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/View/Linker.php
View File

@ -108,7 +108,7 @@ class Linker
private function generateAssets(ParsedFragment $fragment, array &$sections)
{
foreach ($fragment->getCss() as $cssFile) {
$asset = $this->parseAsset($cssFile, 'css');
$asset = $this->parseAsset($cssFile);
if (isset($asset['code'])) {
$sections['inlineCss'] .= '<style>' . PHP_EOL;
$sections['inlineCss'] .= $asset['code'];
@ -119,7 +119,7 @@ class Linker
}
foreach ($fragment->getJs() as $jsFile) {
$asset = $this->parseAsset($jsFile, 'js');
$asset = $this->parseAsset($jsFile);
if (isset($asset['code'])) {
$sections['inlineJs'] .= '<script>' . PHP_EOL;
$sections['inlineJs'] .= $asset['code'];
@ -130,25 +130,22 @@ class Linker
}
}
private function parseAsset(string $asset, string $type): array
private function parseAsset(string $asset): array
{
$output = [];
eval('$asset = ' . $asset . ';');
if (preg_match('/^[\w\/\.]+$/', $asset)) {
if (
empty($_ENV['DEV']) &&
preg_match('/^' . $type . '\/.*/', $asset) &&
filesize(ROOT . '/public/static/' . $asset) < self::INLINE_ASSET_LIMIT
) {
$output['code'] = file_get_contents(ROOT . '/public/static/' . $asset);
} else {
if (!preg_match('/^http(s)?/', $asset)) {
$output['file'] = $_ENV['STATIC_ROOT'] . '/' . $asset . '?rev=<?= REVISION ?>';
$output['file'] = '<?= $_ENV[\'STATIC_ROOT\'] ?>/' . $asset . '?rev=<?= REVISION ?>';
}
} else {
$output['file'] = $asset;
}
}
return $output;
}

4
src/View/Parser.php
View File

@ -126,7 +126,7 @@ class Parser
private function matchExtends(string $line): ?string
{
if (preg_match('/^\s*@extends\(\'([\w\/]+)\'\)\s*$/', $line, $matches)) {
if (preg_match('/^\s*@extends\(([\w\/]+)\)\s*$/', $line, $matches)) {
return $matches[1];
}
@ -135,7 +135,7 @@ class Parser
private function matchSection(string $line): ?string
{
if (preg_match('/^\s*@section\(\'(\w+)\'\)\s*$/', $line, $matches)) {
if (preg_match('/^\s*@section\((\w+)\)\s*$/', $line, $matches)) {
return $matches[1];
}

6
views/account/account.php
View File

@ -1,8 +1,8 @@
@js('js/account/account.js')
@js(js/account/account.js)
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>Account</h2>
<div class="box">
<form id="accountForm" action="/account" method="post" data-observe-inputs="password_new,password_new_confirm">

6
views/account/delete.php
View File

@ -1,8 +1,8 @@
@js('js/account/account.js')
@js(js/account/account.js)
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>Delete account</h2>
<div class="box">
<form id="deleteAccountForm" action="/account/delete" method="post" data-redirect-on-success="/">

8
views/account/google_authenticate.php
View File

@ -1,8 +1,8 @@
@js('js/account/google_authenticate.js')
@js(js/account/google_authenticate.js)
@extends('templates/layout_minimal')
@extends(templates/layout_minimal)
@section('main')
@section(main)
<h2>Authenticate with Google</h2>
<?php if (!$success): ?>
<div class="box">
@ -18,7 +18,7 @@
<?php endif; ?>
@endsection
@section('pageScript')
@section(pageScript)
<script>
var success = <?= $success ? 'true' : 'false' ?>;
<?php if (isset($authenticatedWithGoogleUntil)): ?>

26
views/admin/map_editor.php
View File

@ -1,16 +1,16 @@
@css('node_modules/leaflet/dist/leaflet.css')
@css('css/map_editor.css')
@css('node_modules/leaflet.markercluster/dist/MarkerCluster.css')
@css('node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css')
@css(node_modules/leaflet/dist/leaflet.css)
@css(css/map_editor.css)
@css(node_modules/leaflet.markercluster/dist/MarkerCluster.css)
@css(node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css)
@js('node_modules/leaflet/dist/leaflet.js')
@js('node_modules/leaflet.markercluster/dist/leaflet.markercluster.js')
@js('https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'])
@js('js/map_editor.js')
@js(node_modules/leaflet/dist/leaflet.js)
@js(node_modules/leaflet.markercluster/dist/leaflet.markercluster.js)
@js(https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>)
@js(js/map_editor.js)
@extends('templates/layout_full')
@extends(templates/layout_full)
@section('subheader')
@section(subheader)
<span><a href="javascript:;" id="mapName" title="Edit map data"><?= $mapName ?></a></span><!--
--><span><!--
<?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
@ -38,7 +38,7 @@
--></span>
@endsection
@section('pagemodal')
@section(pagemodal)
<div id="metadata" class="modal">
<h2>Edit map data</h2>
<form id="metadataForm" class="marginTop" data-no-submit="true">
@ -52,7 +52,7 @@
</div>
@endsection
@section('main')
@section(main)
<div id="map"></div>
<div id="panorama"></div>
<div id="noPano">
@ -68,7 +68,7 @@
</div>
@endsection
@section('pageScript')
@section(pageScript)
<script>
var tileUrl = '<?= $_ENV['LEAFLET_TILESERVER_URL'] ?>';
var tileAttribution = '<?= $_ENV['LEAFLET_TILESERVER_ATTRIBUTION'] ?>';

4
views/error/404.php
View File

@ -1,6 +1,6 @@
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>404 | Page not found</h2>
<p>The requested URL was not found on this server. <a href="/" title="<?= $_ENV['APP_NAME'] ?>">Back to start.</a></p>
@endsection

14
views/game.php
View File

@ -1,17 +1,17 @@
@css('css/game.css')
@css(css/game.css)
@js('https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'])
@js('js/game.js')
@js(https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>)
@js(js/game.js)
@extends('templates/layout_full')
@extends(templates/layout_full)
@section('subheader')
@section(subheader)
<span id="mapName" class="bold"><?= $mapName ?></span><!--
--><span>Round <span id="currentRound" class="bold"></span></span><!--
--><span>Score <span id="currentScoreSum" class="bold"></span></span>
@endsection
@section('main')
@section(main)
<div id="panoCover"></div>
<div id="panorama"></div>
<div id="showGuessButtonContainer">
@ -48,7 +48,7 @@
</div>
@endsection
@section('pageScript')
@section(pageScript)
<script>
var mapId = <?= $mapId ?>;
var mapBounds = <?= json_encode($bounds) ?>;

4
views/login/activate.php
View File

@ -1,6 +1,6 @@
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>Account activation</h2>
<div class="box">
<p class="error justify">Activation failed. Please check the link you entered or retry <a href="/signup" title="Sign up">sign up</a>!</p>

4
views/login/cancel.php
View File

@ -1,6 +1,6 @@
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>Account cancellation</h2>
<div class="box">
<?php if ($success) : ?>

4
views/login/google_login.php
View File

@ -1,6 +1,6 @@
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>Login up with Google</h2>
<div class="box">
<p class="error justify">Authentication with Google failed. Please <a href="/login/google" title="Login with Google">try again</a>!</p>

6
views/login/google_signup.php
View File

@ -1,8 +1,8 @@
@js('js/login/google_signup.js')
@js(js/login/google_signup.js)
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>Sign up</h2>
<div class="box">
<form id="googleSignupForm" action="/signup/google" method="post" data-redirect-on-success="/">

4
views/login/login.php
View File

@ -1,6 +1,6 @@
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>Login</h2>
<div class="box">
<form id="loginForm" action="/login" method="post" data-redirect-on-success="/">

6
views/login/signup.php
View File

@ -1,8 +1,8 @@
@js('js/login/signup.js')
@js(js/login/signup.js)
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>Sign up</h2>
<div class="box">
<form id="signupForm" action="/signup" method="post" data-redirect-on-success="/signup/success">

4
views/login/signup_success.php
View File

@ -1,6 +1,6 @@
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<h2>Sign up</h2>
<div class="box">
<p class="justify">Sign up was successful. Please check your email and click on the activation link to activate your account!</p>

10
views/maps.php
View File

@ -1,11 +1,11 @@
@css('css/maps.css')
@js('js/maps.js')
@css(css/maps.css)
@js(js/maps.js)
TODO: condition!
@js('js/maps_admin.js')
@js(js/maps_admin.js)
@extends('templates/layout_normal')
@extends(templates/layout_normal)
@section('main')
@section(main)
<div id="mapContainer">
<?php foreach ($maps as $map): ?>
<div class="mapItem">

4
views/templates/layout_full.php
View File

@ -1,6 +1,6 @@
@extends('templates/mapguesser')
@extends(templates/mapguesser)
@section('content')
@section(content)
<header class="small">
<h1>
<a href="/" title="<?= $_ENV['APP_NAME'] ?>">

4
views/templates/layout_minimal.php
View File

@ -1,6 +1,6 @@
@extends('templates/mapguesser')
@extends(templates/mapguesser)
@section('content')
@section(content)
<header>
<h1>
<img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--

5
views/templates/layout_normal.php
View File

@ -1,5 +1,6 @@
@extends('templates/mapguesser')
@section('content')
@extends(templates/mapguesser)
@section(content)
<header>
<h1>
<a href="/" title="<?= $_ENV['APP_NAME'] ?>">