minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into test.customwristbands.cz

Browse Source
This commit is contained in:
Michal Kváček
2016-04-08 14:14:40 +02:00
parent d75c2838d3 951a8314b7
commit 492225e176
19 changed files with 282 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.htaccess
+18
View File
@@ -15,3 +15,21 @@ RewriteRule ^(assets)/(.*)$ public/$1/$2 [L,NC]
# disable viewing all hiden files
RedirectMatch 403 /\..*$
# disable browsing other files in root
RedirectMatch 403 /composer.*
RedirectMatch 403 /artisan
RedirectMatch 403 /phpunit.xml
# disable browsing directories
# this should be solved also with Option -Indexes, however...
RedirectMatch 403 ^/app
RedirectMatch 403 ^/artisan
RedirectMatch 403 ^/bootstrap
RedirectMatch 403 ^/config
RedirectMatch 403 ^/database
RedirectMatch 403 ^/modules
RedirectMatch 403 ^/scripts
RedirectMatch 403 ^/storage
RedirectMatch 403 ^/tests
RedirectMatch 403 ^/vendor
app/Helpers/functions.php
+14
View File
@@ -0,0 +1,14 @@
<?php
/**
* Define function for escaping characters.
*
* This funcion prevents of creating build-in function, which escapes also accents...
*
* @param $value
*
* @return string
*/
function e($value)
{
return htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
}
app/Http/Controllers/Sitemap.php
+98
View File
@@ -0,0 +1,98 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests;
use App\Models\Content;
class Sitemap extends Controller
{
/**
* @var Content
*/
private $content;
/**
* Sitemap constructor.
*
* @param Content $content
*/
public function __construct(Content $content)
{
$this->content = $content;
}
/**
* Get sitemap for all content pages
*
* @return mixed
*/
public function getMap()
{
// load all public pages
$pages = $this->content->getPageQuery()
->get();
// iterate over all pages and add tag for each of them
foreach ($pages as $page) {
// is this page a homepage? because of URL
if ($page->is_homepage) {
$route = route('page.index');
$priority = 1;
} else {
$route = route('page.content', ['url' => $page->url]);
$priority = 0.8;
}
// compute update frequency
$updateFrequency = $this->getUpdateFrequency($page->updated_at);
// add to all pages
\Sitemap::addTag($route, $page->updated_at, $updateFrequency, $priority);
}
// print sitemap
return \Sitemap::render();
}
/**
* Based on updatedAt compute "changefreq" for sitemap
*
* @param $updatedAt
*/
private function getUpdateFrequency($updatedAt)
{
// shortcuts for times
$day = 24 * 60 * 60;
$week = 7 * $day;
$month = 4 * $week;
$year = 12 * $month;
// change frequencies in format "name" => maximum age of last editation
$changeFrequencies = [
'always' => 300,
'hourly' => 3600,
'daily' => $day,
'weekly' => $week,
'monthly' => $month,
'yearly' => $year,
'never' => PHP_INT_MAX,
];
// get time difference
$timeDiffInMinutes = time() - strtotime($updatedAt);
// iterate over array with all change frequencies and break when time of edit is smaller than maximum time
do {
$changeFrequency = key($changeFrequencies);
$changeFreqMinTime = next($changeFrequencies);
} while ($timeDiffInMinutes > $changeFreqMinTime);
if ($changeFrequency != 'never') {
$changeFrequency = key($changeFrequencies);
}
return $changeFrequency;
}
}
app/Http/routes.php
+6 -2
View File
@@ -222,8 +222,8 @@ Route::group([
Route::post('settings', 'Settings@saveSettings')
->name('settings.save');
Route::get('search', 'Search@getSearch')->name('search');
Route::get('search', 'Search@getSearch')
->name('search');
// custom fields
// ------------------------------
@@ -267,6 +267,10 @@ Route::group(['middleware' => ['web']], function () {
Route::post('admin/login', 'Admin\Login@postLogin')
->name('login');
// route for sitemap
Route::get('sitemap.xml', 'Sitemap@getMap')
->name('sitemap');
// route for all content pages. This rule must be specified last (because it matches every route)
Route::get('{url}', 'Visitor\ContentPage@getPage')
->name('page.content');
app/Models/Content.php
+1 -1
View File
@@ -40,7 +40,7 @@ class Content extends Model
/**
* Getter for query with setup filter for non-deleted and non-draft pages
*/
protected function getPageQuery()
public function getPageQuery()
{
return Content::where('status', '!=', Content::STATUS_DELETED)
->where('status', '!=', Content::STATUS_DRAFT);
composer.json
+2 -1
View File
@@ -10,7 +10,8 @@
"php": ">=5.5.9",
"laravel/framework": "5.2.*",
"pingpong/modules": "~2.0",
"pingpong/menus": "^2.2"
"pingpong/menus": "^2.2",
"watson/sitemap": "^2.0"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
composer.lock
Generated
+71 -25
View File
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "f43cc062336dcfcf344900e76fdb89d2",
"content-hash": "9082c8690c449915674fa1b5194008ae",
"hash": "64dd6115505ac9f62926d5fccc14704d",
"content-hash": "8cefeb3bdf109c79d77ac6cb303a1a96",
"packages": [
{
"name": "classpreloader/classpreloader",
@@ -104,7 +104,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/07a9af2d4de5f9ef0bf2d9ae94421e5fc50d7859",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/2e1b1f7597e2f647e99e96e747fcae9718ac817b",
"reference": "07a9af2d4de5f9ef0bf2d9ae94421e5fc50d7859",
"shasum": ""
},
@@ -172,7 +172,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/e0ef9e9833ca024d251e77e8d82a00ca92b0aa71",
"url": "https://api.github.com/repos/doctrine/cache/zipball/4e3b8b9464d511eccbefe07cef94c275bce7e434",
"reference": "e0ef9e9833ca024d251e77e8d82a00ca92b0aa71",
"shasum": ""
},
@@ -241,7 +241,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/collections/zipball/866e100a425b8b73d15393fd081c6bf067f05bf9",
"url": "https://api.github.com/repos/doctrine/collections/zipball/9f89fd349fd2b537be8a0a0c41f87f2f640dfc8a",
"reference": "866e100a425b8b73d15393fd081c6bf067f05bf9",
"shasum": ""
},
@@ -380,7 +380,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/61e1f860a304c3fb6961ecbec36927b5f20b71c6",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/3df22ccdf20a68fafe34cb1ae452aee7cde7d442",
"reference": "61e1f860a304c3fb6961ecbec36927b5f20b71c6",
"shasum": ""
},
@@ -800,7 +800,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/3f45e9b25bd9c01f6205da3e05ae6eea9b3f4a0e",
"url": "https://api.github.com/repos/laravel/framework/zipball/3d95b0328395b2682ac507a1c81bbeafab8b646b",
"reference": "3f45e9b25bd9c01f6205da3e05ae6eea9b3f4a0e",
"shasum": ""
},
@@ -982,7 +982,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b334d6c5f95364948e06d2f620ab93d084074c6e",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a8294fb7d939433abfaeb0fc1a34a278acfa5b39",
"reference": "b334d6c5f95364948e06d2f620ab93d084074c6e",
"shasum": ""
},
@@ -1065,7 +1065,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/5085630fd606c50d9b09efa0f93c0bdd83603d24",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/064b38c16790249488e7a8b987acf1c9d7383c09",
"reference": "5085630fd606c50d9b09efa0f93c0bdd83603d24",
"shasum": ""
},
@@ -1234,7 +1234,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/06d9ba42dedcee9cda97e81aec92cd876a023e8c",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2d0c3b70f8e701b957fc2e5a35ff32ba57ee5d21",
"reference": "06d9ba42dedcee9cda97e81aec92cd876a023e8c",
"shasum": ""
},
@@ -1699,7 +1699,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/8412f1e1650c27758908c584f63f05bfba3f0314",
"url": "https://api.github.com/repos/symfony/console/zipball/6b1175135bc2a74c08a28d89761272de8beed8cd",
"reference": "8412f1e1650c27758908c584f63f05bfba3f0314",
"shasum": ""
},
@@ -1759,7 +1759,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/b7a2a52278d62b0c5abfdd2e4bb3b55f2109c77f",
"url": "https://api.github.com/repos/symfony/debug/zipball/a06d10888a45afd97534506afb058ec38d9ba35b",
"reference": "b7a2a52278d62b0c5abfdd2e4bb3b55f2109c77f",
"shasum": ""
},
@@ -1816,7 +1816,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df0dbedb6d9407e5305afe7ca34bee0f2878407",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3433bfec93209ce539751591c3a1d9a1ac5ff53b",
"reference": "1df0dbedb6d9407e5305afe7ca34bee0f2878407",
"shasum": ""
},
@@ -1876,7 +1876,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/623bda0abd9aa29e529c8e9c08b3b84171914723",
"url": "https://api.github.com/repos/symfony/finder/zipball/c54e407b35bc098916704e9fd090da21da4c4f52",
"reference": "623bda0abd9aa29e529c8e9c08b3b84171914723",
"shasum": ""
},
@@ -1925,7 +1925,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/8a7648cb85f12e707bab6b6f755ff5d108236023",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/b508c1b4d86581ea2b577f067471333ce6b74221",
"reference": "8a7648cb85f12e707bab6b6f755ff5d108236023",
"shasum": ""
},
@@ -1977,7 +1977,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/c554014544e924e88b6d409e4b0d3b0f19f14d45",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/f7698089cb78b5f200263da8bd6dd7dfa219c114",
"reference": "c554014544e924e88b6d409e4b0d3b0f19f14d45",
"shasum": ""
},
@@ -2226,7 +2226,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/36c9f90f2e9f97ce8a0bdfbe2c230934d64087a1",
"url": "https://api.github.com/repos/symfony/process/zipball/58c8a0217d8d02b902ed9a0f03913d1836db06e8",
"reference": "36c9f90f2e9f97ce8a0bdfbe2c230934d64087a1",
"shasum": ""
},
@@ -2275,7 +2275,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/fa1e9a8173cf0077dd995205da453eacd758fdf6",
"url": "https://api.github.com/repos/symfony/routing/zipball/0013248050fbd7d00ee90e7ea50c26ec425d666a",
"reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6",
"shasum": ""
},
@@ -2350,7 +2350,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91",
"url": "https://api.github.com/repos/symfony/translation/zipball/f7a07af51ea067745a521dab1e3152044a2fb1f2",
"reference": "2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91",
"shasum": ""
},
@@ -2414,7 +2414,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a6a883c48acb215d4825ce9de61dccf93d62074",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/140b51f11947ea959165fd4cae4e1946fa5aa5f0",
"reference": "9a6a883c48acb215d4825ce9de61dccf93d62074",
"shasum": ""
},
@@ -2517,6 +2517,52 @@
"environment"
],
"time": "2016-02-11 08:44:10"
},
{
"name": "watson/sitemap",
"version": "2.0.13",
"source": {
"type": "git",
"url": "https://github.com/dwightwatson/sitemap.git",
"reference": "9d616948c1f997d500f48c8b426ac6dd5640cbff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dwightwatson/sitemap/zipball/9d616948c1f997d500f48c8b426ac6dd5640cbff",
"reference": "9d616948c1f997d500f48c8b426ac6dd5640cbff",
"shasum": ""
},
"require": {
"illuminate/http": "~5.0",
"illuminate/support": "~5.0",
"php": ">=5.4.0"
},
"require-dev": {
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "4.3.*"
},
"type": "library",
"autoload": {
"psr-4": {
"Watson\\": "src/Watson"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Dwight Watson",
"email": "dwightwatson@studious.com.au"
}
],
"description": "Generate Google Sitemaps in Laravel 4/5",
"keywords": [
"laravel",
"sitemaps"
],
"time": "2016-04-05 02:28:57"
}
],
"packages-dev": [
@@ -2584,7 +2630,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/416fb8ad1d095a87f1d21bc40711843cd122fd4a",
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
"shasum": ""
},
@@ -2638,7 +2684,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/86ec14457afce95c9ad57ee8394c57f57a1aaf43",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/684eab1624a66a4c37762c747c88a7f8664c65bf",
"reference": "86ec14457afce95c9ad57ee8394c57f57a1aaf43",
"shasum": ""
},
@@ -3259,7 +3305,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/264188ddf4d3586c80ea615f8ec8eaea34e652a1",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f9733ae34271bec6a6a6a1d4e9a8dd28f2ac1628",
"reference": "264188ddf4d3586c80ea615f8ec8eaea34e652a1",
"shasum": ""
},
@@ -3812,7 +3858,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a5a2d27385655d34fd08557f8a315b6f27cbc5cf",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/18a06d7a9af41718c20764a674a0ebba3bc40d1f",
"reference": "a5a2d27385655d34fd08557f8a315b6f27cbc5cf",
"shasum": ""
},
@@ -3868,7 +3914,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/801d412451594f7c9e7950a016a377798cf9dfa0",
"url": "https://api.github.com/repos/symfony/yaml/zipball/407e31ad9742ace5c3d01642f02a3b2e6062bae5",
"reference": "801d412451594f7c9e7950a016a377798cf9dfa0",
"shasum": ""
},
config/.gitignore
+1
View File
@@ -16,4 +16,5 @@
!queue.php
!services.php
!session.php
!sitemap.php
!view.php
config/app.php
+2
View File
@@ -153,6 +153,7 @@ return [
App\Providers\ModuleManager::class,
Pingpong\Modules\ModulesServiceProvider::class,
Pingpong\Menus\MenusServiceProvider::class,
\Watson\Sitemap\SitemapServiceProvider::class,
/*
* Application Service Providers...
*/
@@ -204,6 +205,7 @@ return [
'Route' => Illuminate\Support\Facades\Route::class,
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
'Sitemap' => Watson\Sitemap\Facades\Sitemap::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
config/sitemap.php
+18
View File
@@ -0,0 +1,18 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Caching
|--------------------------------------------------------------------------
|
| Here you may enable or disable caching of sitemaps for each time they
| are generated. You can also specify the length of time (in minutes)
| they will remain cached.
|
*/
'cache_enabled' => false,
'cache_length' => 60
];
index.php
+2 -3
View File
@@ -7,9 +7,7 @@
* @author Taylor Otwell <taylorotwell@gmail.com>
*/
$uri = urldecode(
parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
);
$uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
// This file allows us to emulate Apache's "mod_rewrite" functionality from the
// built-in PHP web server. This provides a convenient way to test a Laravel
@@ -18,4 +16,5 @@ if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
return false;
}
require_once __DIR__ . '/app/Helpers/functions.php';
require_once __DIR__ . '/public/index.php';
public/favicon.ico
View File
public/modules/staticpages/.gitkeep
View File
public/web.config
-23
View File
@@ -1,23 +0,0 @@
<configuration>
<system.webServer>
<rewrite>
<rules>
<rule name="Imported Rule 1" stopProcessing="true">
<match url="^(.*)/$" ignoreCase="false" />
<conditions>
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
</conditions>
<action type="Redirect" redirectType="Permanent" url="/{R:1}" />
</rule>
<rule name="Imported Rule 2" stopProcessing="true">
<match url="^" ignoreCase="false" />
<conditions>
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
<add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
</conditions>
<action type="Rewrite" url="index.php" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration>
resources/views/admin/content/edit.blade.php
+2 -2
View File
@@ -1,11 +1,11 @@
@extends('admin.layout')
@section('pageName', @trans('admin/contents.edit', ['name' => $page->title]))
@section('pageName', @trans('admin/contents.edit', ['name' => e($page->title)]))
@section('content')
<div class="row">
<h2>@lang('admin/contents.edit', ['name' => $page->title])</h2>
<h2>@lang('admin/contents.edit', ['name' => e($page->title)])</h2>
</div>
<div class="row">
resources/views/admin/content/editForm.blade.php
+1 -5
View File
@@ -29,9 +29,5 @@
</form>
@section('javascripts')
<script src="{{asset('/resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script>
<script type="application/javascript">
CKEDITOR.replace ('pageContent');
</script>
@include('admin.snippets.ckEditor', ['textareaId' => 'pageContent'])
@stop
resources/views/admin/content/newForm.blade.php
+1 -5
View File
@@ -23,9 +23,5 @@
</form>
@section('javascripts')
<script src="{{asset('/resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script>
<script type="application/javascript">
CKEDITOR.replace ('pageContent');
</script>
@include('admin.snippets.ckEditor', ['textareaId' => 'pageContent'])
@stop
resources/views/admin/snippets/ckEditor.blade.php
+26
View File
@@ -0,0 +1,26 @@
<script src="{{asset('/resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script>
<script type="application/javascript">
CKEDITOR.replace ('{{$textareaId}}', {
uiColor: "#F5F5F5",
forcePasteAsPlainText: true,
entities: false,
basicEntities: false,
entities_greek: false,
entities_latin: false,
removePlugins: 'elementspath,about,scayt',
extraPlugins: 'justify',
toolbarGroups: [
{name: 'undo', groups: ['undo']},
{name: 'styles'},
{name: 'basicstyles', groups: ['basicstyles', 'cleanup']},
{name: 'paragraph', groups: ['list', 'indent', 'align', 'blocks']},
{name: 'links'},
{name: 'editing', groups: ['find', 'selection']},
{name: 'insert'},
{name: 'forms'},
{name: 'document', groups: ['mode', 'document', 'doctools']},
{name: 'tools'}
]
});
</script>
public/robots.txt → robots.txt
View File