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

REFACTORING #1880 @4h30m: another ugly refactoring commit

Browse Source
This commit is contained in:
Michal Kváček
2016-10-25 16:50:04 +02:00
parent 28f67ffe3c
commit cc999dd24e
71 changed files with 827 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CMS/Contracts/Content/AdvancedContentModifier.php
+2 -3
View File
@@ -21,12 +21,11 @@ interface AdvancedContentModifier {
* Reason why it is separated from createNew() method is simple - we need to save history of changes.
*
* @param Content $content
* @param Request $request
* @param string $revisionId
* @param $request
*
* @return mixed
*/
public static function edit(Content &$content, Request $request, $revisionId);
public static function edit(Content $content, $request);
/**
* Method called right after content page is marked as deleted
*
app/CMS/Contracts/Interaction.php
+16 -4
View File
@@ -1,9 +1,21 @@
<?php
namespace App\CMS\Contracts;
use App\Http\Requests\Request;
interface Interaction {
public function handle(Request $request, $parameters);
public function getValidationRules($parameters);
/**
* Perform given action
*
* @param $data array input data
* @param $parameters array parameters
*
* @return mixed
*/
public function handle($data, $parameters);
/**
* @param $data array input data
*
* @return array
*/
public function getValidationRules($data = []);
}
app/CMS/Contracts/Modules/TemplateHandler.php
+2 -2
View File
@@ -48,7 +48,7 @@ interface TemplateHandler extends BaseModuleHandler
* This way we can do almost whatever we want - even in template
*
* @param Content $content
* @param Request $request
* @param $request
*/
public static function beforeSave(Content & $content, Request $request);
public static function beforeSave(Content & $content, $request);
}
app/CMS/Contracts/Repositories/Module.php
+5 -3
View File
@@ -4,8 +4,8 @@ namespace App\CMS\Contracts\Repositories;
use App\Models\Content\Content as ContentModel;
use App\Models\Module as ModuleModel;
interface Module extends BaseRepository {
interface Module extends BaseRepository
{
public function getCreateContentTitle(ModuleModel $module);
public function getUpdateContentTitle(ModuleModel $module, ContentModel $content = null);
@@ -14,5 +14,7 @@ interface Module extends BaseRepository {
public function getByHandler($handler);
public function call(ModuleModel $module, $method, ...$parameters);
public function call(ModuleModel $module, $method, $parameters = []);
public function callOnString($moduleHandler, $method, $parameters = []);
}
app/CMS/Handlers/History.php
+1 -1
View File
@@ -43,7 +43,7 @@ class History implements HistoryHandler
'to' => $statuses[$changeset->new_value]
]);
break;
case 'is_homepage':
case 'isHomepage':
return trans('admin/history.setupAsHomepage');
break;
default:
app/CMS/Handlers/Interaction.php
+15 -8
View File
@@ -3,30 +3,37 @@ namespace App\Cms\Handlers\Interactions;
use App\CMS\Contracts\Interaction as InteractionContract;
use App\CMS\Exceptions\Validation\ValidationFailedException;
use App\Http\Requests\Request;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Validator;
class Interaction {
class Interaction
{
/**
* Handle interaction with application
*
* @param Request $request
* @param InteractionContract $interaction
* @param array $parameters
* @param string $interactionClass
* @param array $data
* @param array $extraParameters
*
* @return mixed
* @throws ValidationFailedException
*/
public static function handle(Request $request, InteractionContract $interaction, ...$parameters) {
public static function handle($interactionClass, $data, ...$extraParameters)
{
/**
* @var $interaction InteractionContract
*/
$interaction = App::make($interactionClass);
// validate interaction
$validator = Validator::make($request->all(), $interaction->getValidationRules($parameters));
$validator = Validator::make($data, $interaction->getValidationRules($extraParameters));
if ($validator->fails()) {
throw new ValidationFailedException($validator);
}
// handle it
return $interaction->handle($request, $parameters);
return $interaction->handle($data, $extraParameters);
}
}
app/CMS/Helpers/CurrentTemplate.php
+72 -7
View File
@@ -1,12 +1,13 @@
<?php
namespace App\CMS\Helpers;
use App\CMS\Contracts\Modules\TemplateHandler;
use App\Models\Content\Content;
use App\Models\Module;
use DebugBar\Bridge\MonologCollector;
use App\Models\User;
use Illuminate\Database\QueryException;
use Monolog\Logger;
class CurrentTemplate
class CurrentTemplate implements TemplateHandler
{
protected static $template;
protected static $initialized = false;
@@ -20,14 +21,14 @@ class CurrentTemplate
{
if (!self::$initialized) {
try {
self::$template = Module::where('is_template', true)
->where('enabled', true)
->first();
self::$template = Module::where('is_template', true)
->where('enabled', true)
->first();
} catch (QueryException $e) {
throw new \ErrorException('DB not migrated, please, do so!');
}
if (self::$template) {
self::$template->module_settings = json_decode(self::$template->module_settings);
self::$template->moduleSettings = json_decode(self::$template->moduleSettings);
}
self::$initialized = true;
@@ -60,4 +61,68 @@ class CurrentTemplate
{
self::$initialized = false;
}
/**
* Register admin menu (or multiple ones)
*
* This cannot be in ServiceProvider because Session is started at middleware. And ServiceProvider is called before
* starting any middleware..
*
* @param User $user model of logged user
*/
public static function registerAdminMenu(User $user)
{
call_user_func_array([self::handler(), 'registerAdminMenu'], [$user]);
}
/**
* Get list of registered templates and supported modules.
*
* Returned array is expected to be array of arrays with following items: module, namespace and templateName.
* Example:
* return [
* ['module' => 'Article', 'templateName' => 'article::template.name']
* ];
*
* When no "namespace" is specified, value strtolower(module) is used instaed.
*
* @return array
*/
public static function getPublicTemplatePaths()
{
return call_user_func([self::handler(), 'getPublicTemplatePaths']);
}
/**
* Prepare Content object to be rendered using Blade template
*
* @param Content $content
*/
public static function beforeRender(Content & $content)
{
call_user_func_array([self::handler(), 'beforeRender'], [&$content]);
}
/**
* Modify input data into format which can be understood by edit template
*
* @param Content $content
*/
public static function beforePopulatingEditForm(Content & $content)
{
call_user_func_array([self::handler(), 'beforePopulatingEditForm'], [&$content]);
}
/**
* Slightly modify Content object before saving into database.
*
* This way we can do almost whatever we want - even in template
*
* @param Content $content
* @param $request
*/
public static function beforeSave(Content & $content, $request)
{
call_user_func_array([self::handler(), 'beforeSave'], [&$content, $request]);
}
}
app/CMS/Helpers/PageRenderer.php
+2 -2
View File
@@ -24,7 +24,7 @@ class PageRenderer
public static function render(Content $page)
{
// decode module settings
$page->module_settings = json_decode($page->module_settings);
$page->moduleSettings = json_decode($page->moduleSettings);
// do something template-specific
$parameters = call_user_func_array([CurrentTemplate::handler(), 'beforeRender'], [&$page]);
@@ -33,7 +33,7 @@ class PageRenderer
* @var $handler AppHandler
*/
// get handler
$handler = new $page->module_handler;
$handler = new $page->moduleHandler;
$page->content = Shortcode::compile($page->content);
app/CMS/Helpers/Traits/Nullable.php
+33
View File
@@ -0,0 +1,33 @@
<?php
namespace App\CMS\Helpers\Traits;
use Carbon\Carbon;
/**
* Class Nullable
*
* @package App\CMS\Helpers\Traits
*/
trait Nullable {
/**
* Get null or parsed date
*
* @param $date
*
* @return null|string
*/
public function nullableDate($date) {
return empty($date) ? null : Carbon::parse($date)->toDateTimeString();
}
/**
* Get null or input value
*
* @param $string
*
* @return null
*/
public function nullable($string) {
return empty($string) ? null : $string;
}
}
app/CMS/Helpers/functions.php
+4
View File
@@ -27,4 +27,8 @@ function setting($key, $default = null) {
function asset_path($path) {
return env('SITE_URL').'/assets/'.$path;
}
function template_name($name, $throwExceptions = true) {
return \App\CMS\Helpers\Template::name($name, $throwExceptions);
}
app/CMS/Interactions/Admin/Content/ChangeStatus.php
+24
View File
@@ -0,0 +1,24 @@
<?php
namespace App\CMS\Interactions\Admin\Content;
use App\CMS\Contracts\Interaction;
use App\Http\Requests\Request;
class ChangeStatus implements Interaction {
public function handle(Request $data, $parameters)
{
$statuses = ContentStatuses::getWithTranslations();
// check if given status is valid
if (!isset($statuses[$status])) {
return redirect()
->route('content.overview')
->with('error', trans('admin/contents.invalidStatus'));
}
}
public function getValidationRules($parameters)
{
// TODO: Implement getValidationRules() method.
}
}
app/CMS/Interactions/Admin/Content/EditContent.php
+40 -53
View File
@@ -7,6 +7,8 @@ use App\CMS\Enumerations\ContentStatuses;
use App\CMS\Helpers\CurrentTemplate;
use App\Events\EditContent as EditContentEvent;
use App\Http\Requests\Request;
use App\Models\Content\Content;
use App\Models\FileManager\File;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Str;
@@ -17,74 +19,59 @@ class EditContent implements Interaction
* @var Module
*/
protected $module;
/**
* @var File
*/
protected $file;
public function __construct()
{
$this->module = App::make(Module::class);
$this->file = App::make(File::class);
}
public function handle(Request $request, $parameters)
/**
* Edit page
*
* @param array $data
* @param array $parameters
*
* @return mixed|void
*/
public function handle($data, $parameters)
{
$page = $parameters[0];
// upload file - if provided
// todo use interaction
$file = $page->uploadTitlePhoto($request);
/**
* @var $page Content
*/
list($page, $titlePhoto, $relatedFiles) = $parameters;
// let template to modify request and content page
call_user_func_array([CurrentTemplate::handler(), 'beforeSave'], [&$page, $request]);
CurrentTemplate::beforeSave($page, $data);
$request->url = Str::slug($request->url);
$request->parentPage = $request->parentPage ? $request->parentPage : null;
$request->publishedFrom = empty($request->publishedFrom) ? null : $request->publishedFrom;
$request->publishedTo = empty($request->publishedTo) ? null : $request->publishedTo;
// upload file - if provided
$data['titlePhoto'] = isset($data['existingTitlePhoto']) ? $data['existingTitlePhoto'] : null;
if (!$file) {
$request->titlePhotoFilename = empty($request->existingTitlePhoto) ? null : $request->existingTitlePhoto;
} else {
$request->titlePhotoFilename = $file['filename'];
if (!is_null($titlePhoto)) {
$file = $this->file->upload($titlePhoto);
$data['titlePhoto'] = $file ? $file['filename'] : null;
}
// array of fields in database and fields from request
$fields = [
'title' => 'title',
'url' => 'url',
'template' => 'template',
'published_from' => 'publishedFrom',
'published_to' => 'publishedTo',
'meta_keywords' => 'metaKeywords',
'meta_description' => 'metaDescription',
'content' => 'pageContent',
'parent_id' => 'parentPage',
'status' => 'status',
'title_photo' => 'titlePhotoFilename',
'category_id' => 'category'
];
// save new values with history
// todo move this method out of the controller!
$data = \App\Http\Controllers\Admin\Contents\EditContent::getFields($request, array_values($fields));
// todo use Model Observer and model::original attributes
list($revision, $changedColumns) = $page->updateWithHistory($fields, $data);
$module = $this->module->getByHandler($page->module_handler);
$changedColumns += $this->module->call($module, 'edit', [&$page, $request, $revision]);
$page->update($data);
$this->module->callOnString($page->moduleHandler, 'edit', [$page, $data]);
// move to interaction
$changedColumns += $page->uploadRelatedFiles($request, $revision);
if ($changedColumns > 0) {
Event::fire(new EditContentEvent($page, $revision));
}
return [$page, $revision, $changedColumns];
$keepAssigned = isset($data->keepAssigned) ? $data->keepAssigned : [];
$page->uploadRelatedFiles($relatedFiles, $keepAssigned);
}
public function getValidationRules($parameters)
/**
* Validate this interaction
*
* @param array $parameters
*
* @return array
*/
public function getValidationRules($parameters = [])
{
$id = $parameters[0]->id;
@@ -97,7 +84,7 @@ class EditContent implements Interaction
'url' => 'required|unique:contents,url,' . $id,
'publishedFrom' => 'date',
'publishedTo' => 'date',
'title_photo' => 'exists:files,id',
'titlePhoto' => 'exists:files,id',
'status' => 'required|in:' . $statuses,
'parentPage' => 'exists:contents,id'
];
app/CMS/Interactions/Admin/Content/NewContent.php
+35 -35
View File
@@ -2,10 +2,13 @@
namespace App\Cms\Interactions\Admin\Content;
use App\CMS\Contracts\Interaction;
use App\CMS\Contracts\Repositories\Content as ContentRepository;
use App\CMS\Contracts\Repositories\Module;
use App\CMS\Helpers\CurrentTemplate;
use App\Events\CreateNewContent;
use App\Http\Requests\Request;
use App\Models\Content\Content;
use App\Models\FileManager\File;
use Carbon\Carbon;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Str;
@@ -13,73 +16,70 @@ use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
class NewContent implements Interaction
{
/**
* @var ContentRepository
*/
protected $content;
/**
* @var File
*/
protected $file;
/**
* @var Module
*/
protected $module;
public function __construct()
{
$this->content = App::make(\App\CMS\Contracts\Repositories\Content::class);
$this->content = App::make(ContentRepository::class);
$this->module = App::make(Module::class);
$this->file = App::make(File::class);
}
/**
* @param Request $request
* Create new content page
*
* @param array $data
* @param $parameters
*
* @return Content
*/
public function handle(Request $request, $parameters)
public function handle($data, $parameters)
{
list($moduleHandler) = $parameters;
// create new page
$page = new Content();
$page->template = $request->template;
// setup basic info
$page->user_id = \Auth::user()->id;
$page->language = LaravelLocalization::getCurrentLocale();
$page->title = $request->title;
$page->url = Str::slug($request->url);
$page->published_from = empty($request->publishedFrom) ? null : $request->publishedFrom;
$page->published_to = empty($request->publishedTo) ? null : $request->publishedTo;
$page->meta_keywords = $request->metaKeywords;
$page->meta_description = $request->metaDescription;
$page->content = $request->pageContent;
$page->status = $request->status;
$page->module_handler = $moduleHandler;
$page->category_id = (int)$request->category > 0 ? $request->category : null;
$page->parent_id = $request->parentPage ? $request->parentPage : null;
list($moduleHandler, $titlePhoto, $relatedFiles) = $parameters;
// upload file - if provided
$file = $page->uploadTitlePhoto($request);
$file = !is_null($titlePhoto) ? $this->file->upload($titlePhoto) : null;
$page->title_photo = $file ? $file['filename'] : null;
$data['userId'] = \Auth::user()->id;
$data['language'] = LaravelLocalization::getCurrentLocale();
$data['titlePhoto'] = $file ? $file['filename'] : null;
$data['moduleHandler'] = $moduleHandler;
$page = Content::create($data);
// save module-specific stuff
call_user_func_array([$request->handler, 'createNew'], [&$page, $request]);
$this->module->callOnString($moduleHandler, 'createNew', [&$page, $data]);
// let template to modify request and content page
call_user_func_array([CurrentTemplate::handler(), 'beforeSave'], [&$page, $request]);
// let template to modify data and content page
CurrentTemplate::beforeSave($page, $data);
// save content of page before (possible) uploading related files
$page->save();
// upload files assigned to content page
$page->uploadRelatedFiles($request);
Event::fire(new CreateNewContent($this));
$page->uploadRelatedFiles($relatedFiles);
return $page;
}
public function getValidationRules($parameters)
public function getValidationRules($parameters = [])
{
return [
'titlePhoto' => 'image',
'title' => 'required',
'url' => 'required|unique:contents,url',
'status' => 'required|in:draft,protected,public',
'title_photo' => 'exists:files,id',
'parentPage' => 'exists:contents,id',
'publishedFrom' => 'date',
'publishedTo' => 'date',
app/CMS/Observers/Content.php
+102
View File
@@ -0,0 +1,102 @@
<?php
namespace App\CMS\Observers;
use App\Events\CreateNewContent;
use App\Models\Content\Content as ContentModel;
use App\Models\Content\ContentHistory;
use Illuminate\Support\Facades\Event;
class Content
{
protected $changeset;
public function __construct()
{
$this->changeset = uniqid();
}
/**
* @param ContentModel $content
*/
public function created(ContentModel $content)
{
Event::fire(new CreateNewContent($content));
}
/**
* Get all dirty changed from model.
*
* If user did not change moduleSettings column, return result from ContentModel::getDirty(). Otherwise append all
* changed columns from module settings.
*
* @param $changed
* @param $original
*
* @return array
*/
protected function getDirtyFields($changed, $original)
{
unset($changed['updated_at']);
$changes = $this->getNewAndOldValues(array_keys($changed), $changed, $original);
if (!isset($changed['moduleSettings']))
return $changes;
$moduleSettings = (array)json_decode($changed['moduleSettings']);
$originalSettings = (array)json_decode($original['moduleSettings']);
unset($changed['moduleSettings']);
$settingChanged = array_keys(array_diff_assoc($moduleSettings, $originalSettings));
$changesInSettings = $this->getNewAndOldValues($settingChanged, $moduleSettings, $originalSettings);
return array_merge($changes, $changesInSettings);
}
/**
*
*
* @param $fields
* @param $new
* @param $original
*
* @return array
*/
protected function getNewAndOldValues($fields, $new, $original) {
$changes = [];
foreach ($fields as $field) {
$changes[$field] = [
'new' => isset($new[$field]) ? $new[$field] : null,
'old' => isset($original[$field])? $original[$field] : null
];
}
return $changes;
}
public function updated(ContentModel $content)
{
$fields = $this->getDirtyFields($content->getDirty(), $content->getOriginal());
foreach ($fields as $field => $change) {
$history = [
'user_id' => \Auth::user()->id,
'content_id' => $content->id,
'edit_batch' => $this->changeset,
'column' => $field,
'old_value' => $change['old'],
'new_value' => $change['new']
];
// save history
ContentHistory::create($history);
}
}
/**
* @param ContentModel $content
*/
public function deleted(ContentModel $content)
{
}
}
app/CMS/Repositories/Content/Content.php
+32 -23
View File
@@ -29,14 +29,14 @@ class Content extends Repository implements IContent
return ContentModel::where('status', '!=', IContent::STATUS_DRAFT)
->select('contents.*')
->with('author')
->join('modules', 'modules.handler', '=', 'contents.module_handler')
->join('modules', 'modules.handler', '=', 'contents.moduleHandler')
->where(function ($query) {
$query->where('published_from', '<', Carbon::now())
->orWhereNull('published_from');
$query->where('publishedFrom', '<=', Carbon::now())
->orWhereNull('publishedFrom');
})
->where(function ($query) {
$query->where('published_to', '>', Carbon::now())
->orWhereNull('published_to');
$query->where('publishedTo', '>=', Carbon::now())
->orWhereNull('publishedTo');
})
->where('language', LaravelLocalization::getCurrentLocale())
->whereNull('contents.deleted_at')
@@ -46,9 +46,14 @@ class Content extends Repository implements IContent
public function all()
{
return $this->getPageQuery()
->get();
->get();
}
/**
* @param int $id
*
* @return mixed
*/
public function getOne($id = null)
{
if (is_null($id)) {
@@ -56,16 +61,9 @@ class Content extends Repository implements IContent
$page->user_id = \Auth::user()->id;
$page->language = LaravelLocalization::getCurrentLocale();
$page->status = IContent::STATUS_DRAFT;
$page->module_settings = [];
$page->moduleSettings = [];
} else {
if (is_numeric($id)) {
$page = $this->model->findOrFail($id);
} else {
$page = $this->model->where('language', LaravelLocalization::getCurrentLocale())
->where('url', $id)
->firstOrFail();
}
$page->module_settings = json_decode($page->module_settings);
}
return $page;
@@ -78,8 +76,9 @@ class Content extends Repository implements IContent
public function getHomepage()
{
return $this->getPageQuery()
->where('is_homepage', 1)
->first();
->where('isHomepage', 1)
->first();
}
/**
@@ -91,9 +90,17 @@ class Content extends Repository implements IContent
*/
public function getByURL($url)
{
return $this->getPageQuery()
->where('url', $url)
->first();
$page = $this->getPageQuery()
->where('url', $url)
->first();
if (is_null($page)) {
return null;
}
$page->moduleSettings = json_decode($page->moduleSettings);
return $page;
}
/**
@@ -108,8 +115,8 @@ class Content extends Repository implements IContent
public function getOverview($handler = null, $statuses = null)
{
$query = ContentModel::select('contents.*', 'modules.name AS module_name', 'modules.id AS module_id')
->join('modules', 'modules.handler', '=', 'contents.module_handler')
->join('users', 'users.id', '=', 'contents.user_id')
->join('modules', 'modules.handler', '=', 'contents.moduleHandler')
->join('users', 'users.id', '=', 'contents.userId')
->addSelect(DB::raw('COALESCE(users.name, users.email) AS author_name'))
->addSelect('users.email AS author_email')
->whereNull('contents.deleted_at')
@@ -119,7 +126,7 @@ class Content extends Repository implements IContent
// filter results using handler
if (!is_null($handler)) {
$query = $query->where('contents.module_handler', $handler);
$query = $query->where('contents.moduleHandler', $handler);
}
// add filtering by status
@@ -127,6 +134,8 @@ class Content extends Repository implements IContent
$query = $query->whereIn('contents.status', $statuses);
}
return $query->paginate(20);
$pages = $query->paginate(setting('paginatedResults', 20));
return $pages;
}
}
app/CMS/Repositories/Module.php
+12 -3
View File
@@ -36,8 +36,8 @@ class Module extends Repository implements IModule
public function getUpdateContentTitle(ModuleModel $module, Content $content = null)
{
$pageHeading = trans('admin/contents.new', ['name' => trans($module->name)]);
$moduleHeading = $this->call($module, 'getEditTitle', $content);
$pageHeading = trans('admin/contents.edit', ['name' => trans($module->name)]);
$moduleHeading = $this->call($module, 'getEditTitle', [$content]);
return is_null($moduleHeading) ? $pageHeading : $moduleHeading;
}
@@ -62,7 +62,7 @@ class Module extends Repository implements IModule
->firstOrFail();
}
public function call(ModuleModel $module, $method, ...$parameters)
public function call(ModuleModel $module, $method, $parameters = [])
{
if (!is_null($module) && is_callable([$module->handler, $method])) {
return call_user_func_array([$module->handler, $method], $parameters);
@@ -70,4 +70,13 @@ class Module extends Repository implements IModule
return null;
}
public function callOnString($moduleHandler, $method, $parameters = [])
{
if (is_callable([$moduleHandler, $method])) {
return call_user_func_array([$moduleHandler, $method], $parameters);
}
return null;
}
}
app/CMS/Widgets/Menu/Presenters/Menu.php
+2 -2
View File
@@ -54,8 +54,8 @@ class Menu implements WidgetRenderer
}
$page = $pages[$pageId];
$active = ($page->is_homepage && $route == 'page.index') || ($route == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url);
$route = $page->is_homepage ? route('page.index') : route('page.content', ['url' => $page->url]);
$active = ($page->isHomepage && $route == 'page.index') || ($route == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url);
$route = $page->isHomepage ? route('page.index') : route('page.content', ['url' => $page->url]);
$code .= '<li';
if ($active) {
app/Console/Commands/SetTemplate.php
+1 -1
View File
@@ -42,7 +42,7 @@ class SetTemplate extends Command
$config['staticName'] = $template;
if ($current) {
$info = json_decode($current->module_settings);
$info = json_decode($current->moduleSettings);
$this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $info->staticName . '.');
$confirm = $this->confirm('Uninstall it and install *' . trans($config['name']) . '*? All data associated with installed template will be lost!');
app/Http/Controllers/Admin/Contents/ContentActions.php
+11 -17
View File
@@ -36,18 +36,17 @@ class ContentActions extends Controller
->with('error', trans('admin/contents.invalidStatus'));
}
try {
// try to find this page
$page = Content::findOrFail($id);
} catch (NotFoundHttpException $e) {
// page not found
return redirect()
->route('content.overview')
->with('error', trans('admin/contents.invalidPage'));
}
// try to change the page
list ($revision, $changedColumns) = $page->updateWithHistory(['status' => 'status'], ['status' => $status]);
// fire events
if ($status != Content::STATUS_DRAFT) {
Event::fire(new PublishContent($page, $revision));
} else {
Event::fire(new MakeDraftFromContent($page, $revision));
}
// was something changed?
if ($changedColumns == 0) {
@@ -56,12 +55,7 @@ class ContentActions extends Controller
->with('error', trans('admin/contents.nothingToEdit'));
}
// fire events
if ($status != Content::STATUS_DRAFT) {
Event::fire(new PublishContent($page, $revision));
} else {
Event::fire(new MakeDraftFromContent($page, $revision));
}
// redirect back to overview with info for user
return redirect()
@@ -97,7 +91,7 @@ class ContentActions extends Controller
$page->delete();
// let module to delete some extra content created during page's life
call_user_func([$page->module_handler, 'delete'], $page);
call_user_func([$page->moduleHandler, 'delete'], $page);
// trigger delete event
Event::fire(new DeleteContent($page));
@@ -134,12 +128,12 @@ class ContentActions extends Controller
}
// disable any other existing homepage
Content::where('is_homepage', 1)
Content::where('isHomepage', 1)
->where('language', LaravelLocalization::getCurrentLocale())
->update(['is_homepage' => 0]);
->update(['isHomepage' => 0]);
// set new homepage
list ($revision, $changedColumns) = $page->updateWithHistory(['is_homepage' => 'is_homepage'], ['is_homepage' => 1]);
list ($revision, $changedColumns) = $page->updateWithHistory(['isHomepage' => 'isHomepage'], ['isHomepage' => 1]);
// was something changed?
if ($changedColumns == 0) {
app/Http/Controllers/Admin/Contents/CreateNewContent.php
+4 -1
View File
@@ -103,8 +103,11 @@ class CreateNewContent extends Controller
{
$module = $this->module->getOne($moduleId);
$titlePhoto = $request->file('titlePhoto');
$relatedFiles = $request->all()['files'];
// create new page
Interaction::handle($request, new NewContent(), $module->handler);
Interaction::handle(NewContent::class, $request->all(), $module->handler, $titlePhoto, $relatedFiles);
return redirect()
->route('content.overview')
app/Http/Controllers/Admin/Contents/EditContent.php
+10 -14
View File
@@ -71,24 +71,24 @@ class EditContent extends Controller
/**
* Display form for editing static page
*
* @param $url
* @param $id
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function edit($url)
public function edit($id)
{
$statuses = ContentStatuses::getWithTranslations();
$page = $this->content->getOne($url);
$page = $this->content->getOne($id);
// get module ID
$module = $this->module->getByHandler($page->module_handler);
$module = $this->module->getByHandler($page->moduleHandler);
$pageHeading = $this->module->getUpdateContentTitle($module, $page);
$templates = $this->template->getForModule($module);
$categories = $this->category->getForModule($module);
$history = $this->history->getStructuredHistoryOf($page);
// modify data for edit form according to installed template
call_user_func_array([CurrentTemplate::handler(), 'beforePopulatingEditForm'], [&$page]);
CurrentTemplate::beforePopulatingEditForm($page);
// render view
return view('admin.content.edit', [
@@ -132,14 +132,10 @@ class EditContent extends Controller
}
// edit page
list($page, $revision, $changedColumns) = Interaction::handle($request, new EditContentInteraction(), $page);
$titlePhoto = $request->file('titlePhoto');
$relatedFiles = $request->all()['files'];
// was something changed?
if ($changedColumns == 0) {
return redirect()
->route('content.edit', ['id' => $page->id])
->with('error', trans('admin/contents.nothingToEdit'));
}
Interaction::handle(EditContentInteraction::class, $request->all(), $page, $titlePhoto, $relatedFiles);
// something was changed, inform user
return redirect()
@@ -150,12 +146,12 @@ class EditContent extends Controller
/**
* Convert object of all request data into array of only wanted fields
*
* @param Request $request
* @param $request
* @param $fields
*
* @return array
*/
public static function getFields(Request $request, $fields)
public static function getFields($request, $fields)
{
$requestData = [];
app/Http/Controllers/Sitemap.php
+3 -4
View File
@@ -2,8 +2,8 @@
namespace App\Http\Controllers;
use App\CMS\Contracts\Repositories\Content;
use App\Http\Requests;
use App\Models\Content\Content;
class Sitemap extends Controller
{
@@ -30,14 +30,13 @@ class Sitemap extends Controller
public function getMap()
{
// load all public pages
$pages = $this->content->getPageQuery()
->get();
$pages = $this->content->all();
// 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) {
if ($page->isHomepage) {
$route = route('page.index');
$priority = 1;
} else {
app/Http/routes/admin/contents.php
+1 -1
View File
@@ -9,7 +9,7 @@ Route::group(['namespace' => 'Contents'], function () {
->name('content.new');
// form for editing existing static page
Route::get('content/edit/{url}', 'EditContent@edit')
Route::get('content/edit/{id}', 'EditContent@edit')
->name('content.edit');
// post method for creating new static page
app/Models/Content/Content.php
+103 -14
View File
@@ -2,10 +2,14 @@
namespace App\Models\Content;
use App\CMS\Contracts\Repositories\Content as ContentContract;
use App\CMS\Helpers\Traits\Nullable;
use App\CMS\Observers\Content as ContentObserver;
use App\Models\FileManager\File;
use App\Models\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Str;
use Modules\Categories\Entities\Category;
/**
@@ -13,27 +17,41 @@ use Modules\Categories\Entities\Category;
*/
class Content extends Model
{
use SoftDeletes, ModelTraits\Content;
use SoftDeletes, ModelTraits\Content, Nullable;
public $timestamps = true;
protected $fillable = [
'user_id',
'parent_id',
'category_id',
'userId',
'parentId',
'categoryId',
'language',
'module_handler',
'published_from',
'published_to',
'title_photo',
'moduleHandler',
'publishedFrom',
'publishedTo',
'titlePhoto',
'template',
'is_homepage',
'isHomepage',
'title',
'url',
'meta_keywords',
'meta_description',
'content',
'module_settings',
'metaKeywords',
'metaDescription',
'pageContent',
'moduleSettings',
'status'
];
protected $casts = [
'isHomepage' => 'boolean',
'moduleSettings' => 'array'
];
/**
* Assign observer for this model for logging
*/
protected static function boot()
{
parent::boot();
self::observe(ContentObserver::class);
}
/**
* Mark relationship with its historical records
@@ -52,7 +70,7 @@ class Content extends Model
*/
public function author()
{
return $this->belongsTo(User::class, 'user_id');
return $this->belongsTo(User::class, 'userId');
}
/**
@@ -74,4 +92,75 @@ class Content extends Model
{
return $this->belongsTo(Category::class);
}
/**
* Subpages assigned to page
*
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function subpages()
{
return $this->hasMany(Content::class, 'parentId');
}
/**
* Parent page
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function parentPage()
{
return $this->belongsTo(Content::class, 'parentId');
}
/**
* Is current content draft?
*
* @return bool
*/
public function isDraft()
{
return $this->status == ContentContract::STATUS_DRAFT;
}
/**
* Is current content visible for all visitors?
*
* @return bool
*/
public function isPublic()
{
return $this->status == ContentContract::STATUS_PUBLIC;
}
/**
* Is current content visible only for logged users?
*
* @return bool
*/
public function isProtected()
{
return $this->status == ContentContract::STATUS_PROTECTED;
}
/**
* Is current content visible for logged user OR for everyone?
*
* @return bool
*/
public function isVisible()
{
return $this->isPublic() || $this->isProtected();
}
public function save(array $options = [])
{
$this->parentId = $this->nullable($this->parentId);
$this->categoryId = $this->nullable($this->categoryId);
$this->publishedFrom = $this->nullableDate($this->publishedFrom);
$this->publishedTo = $this->nullableDate($this->publishedTo);
$this->url = Str::slug($this->url);
return parent::save($options);
}
}
app/Models/Content/ContentHasFile.php
+11 -1
View File
@@ -2,15 +2,25 @@
namespace App\Models\Content;
use App\Models\FileManager\File;
use Illuminate\Database\Eloquent\Model;
class ContentHasFile extends Model
{
public $timestamps = false;
public $table = 'contents_has_files';
protected $fillable = [
'content_id',
'file_id'
];
public function content()
{
return $this->hasOne(Content::class);
}
public function file()
{
return $this->hasOne(File::class);
}
}
app/Models/Content/ModelTraits/Content.php
+12 -221
View File
@@ -1,215 +1,29 @@
<?php
namespace App\Models\Content\ModelTraits;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\Http\Requests\Request;
use App\Models\Content\ContentHasFile;
use App\Models\Content\ContentHistory;
use App\Models\FileManager\Directory;
use App\Models\FileManager\File;
use Illuminate\Support\Facades\App;
trait Content
{
/**
* @var File
*/
private $file;
protected $foundSubpages = [];
protected $subpagesInit = false;
public function __construct()
{
$this->file = App::make(File::class);
}
/**
* Is current content draft?
*
* @return bool
*/
public function isDraft()
{
return $this->status == IContent::STATUS_DRAFT;
}
/**
* Is current content visible for all visitors?
*
* @return bool
*/
public function isPublic()
{
return $this->status == IContent::STATUS_PUBLIC;
}
/**
* Is current content visible only for logged users?
*
* @return bool
*/
public function isProtected()
{
return $this->status == IContent::STATUS_PROTECTED;
}
/**
* Is current content visible for logged user OR for everyone?
*
* @return bool
*/
public function isVisible()
{
return $this->isPublic() || $this->isProtected();
}
/**
* Get list of all subpages
*
* @param bool $orderBy
* @param bool $orderDirection
*
* @return array
*/
public function subpages($orderBy = false, $orderDirection = false)
{
if (!$this->subpagesInit) {
$subpages = $this->getPageQuery()
->where('contents.parent_id', $this->id);
if ($orderBy) {
$subpages->orderBy($orderBy, $orderDirection ? $orderDirection : 'ASC');
}
$subpages = $subpages->get();
// convert JSON settings into stdClass
foreach ($subpages as $i => $subpage) {
$subpages[$i]->module_settings = json_decode($subpage->module_settings);
}
$this->subpagesInit = true;
$this->foundSubpages = $subpages;
}
return $this->foundSubpages;
}
/**
* Returns list of all root pages - those pages, which parent_id is null
*
* @return mixed
*/
public function rootPages()
{
$rootPages = $this->getPageQuery()
->where('parent_id', null);
if ($this->id) {
$rootPages = $rootPages->where('id', '!=', $this->id);
}
return $rootPages->get();
}
/**
* Updates current model with information about changed columns
*
* @param array $fields
* @param array $request
* @param string $revisionId
*
* @return array revisionID and number of changed columns
*/
public function updateWithHistory(array $fields, array $request, $revisionId = null)
{
if (!$revisionId) {
$revisionId = uniqid();
}
$changed = 0;
foreach ($fields as $fieldDB => $fieldRequest) {
// ignore non-existing fields
if (!isset($request[$fieldRequest]) && !is_null($request[$fieldRequest])) {
continue;
}
// if module settings is still JSON, decode it to normal stdClass
if (is_string($this->module_settings)) {
$this->module_settings = json_decode($this->module_settings);
}
// are we editing common settings, or module-specific settings?
if (!in_array($fieldDB, $this->fillable)) {
// this field is not part of "core" content - probably it will be module settings
$commonField = false;
$fieldValue = isset($this->module_settings->$fieldDB) ? $this->module_settings->$fieldDB : null;
} else {
$commonField = true;
$fieldValue = $this->$fieldDB;
}
// remove any whitespaces around real content
if (!is_null($request[$fieldRequest])) {
$request[$fieldRequest] = trim($request[$fieldRequest]);
}
if (trim($fieldValue) != $request[$fieldRequest]) {
$this->saveHistory($revisionId, $fieldRequest, $fieldValue, $request);
// save change into database
if ($commonField) {
$this->$fieldDB = $request[$fieldRequest];
} else {
$this->module_settings->$fieldDB = $request[$fieldRequest];
}
$changed++;
}
}
// make JSON from stdClass
if (!is_string($this->module_settings)) {
$this->module_settings = json_encode($this->module_settings);
}
$this->save();
return [$revisionId, $changed];
}
/**
* Upload and set some image as title photo
*
* @param Request $request
*/
public function uploadTitlePhoto(Request $request)
{
if ($request->hasFile('titlePhoto')) {
return $this->file->upload($request->file('titlePhoto'), $request);
}
return null;
}
/**
* Upload and assign files to newly created content page
*
* @param Request $request
* @param null $revisionId
* @param $files
* @param $assignedFiles
* @param null $revisionId
*
* @return int
*/
public function uploadRelatedFiles(Request $request, $revisionId = null)
public function uploadRelatedFiles($files, $assignedFiles = [], $revisionId = null)
{
$files = $request->all()['files'];
$changed = 0;
// check if any file was removed
if ($revisionId) {
$changed += $this->removeRelatedFiles($revisionId, $request);
$changed += $this->removeRelatedFiles($revisionId, $assignedFiles);
}
// allow uploading only on created pages
@@ -222,13 +36,16 @@ trait Content
'name' => '.content_files',
'hidden' => true
]);
$request->directoryId = $directory->id;
$data = new \stdClass();
$data->directoryId = $directory->id;
$fileModel = App::make(File::class);
foreach ($files as $file) {
if (!$file) {
continue;
}
$uploaded = $this->file->upload($file, $request);
$uploaded = $fileModel->upload($file, $data);
// add assignement
ContentHasFile::create([
@@ -250,16 +67,13 @@ trait Content
* Delete files from association
*
* @param $revisionId
* @param $request
*
* @return int
*/
private function removeRelatedFiles($revisionId, $request)
private function removeRelatedFiles($revisionId, $assignedFiles)
{
$files = array_keys((array)$request->keepAssigned);
$allFiles = $this->files()
->whereNotIn('id', $files)
->whereNotIn('id', $assignedFiles)
->get();
foreach ($allFiles as $file) {
@@ -273,29 +87,6 @@ trait Content
return count($allFiles);
}
/**
* Save history entry into database
*
* @param $revisionId
* @param $fieldRequest
* @param $fieldValue
* @param $request
*/
private function saveHistory($revisionId, $fieldRequest, $fieldValue, $request)
{ // setup history object
$history = [
'user_id' => \Auth::user()->id,
'content_id' => $this->id,
'edit_batch' => $revisionId,
'column' => $fieldRequest,
'old_value' => $fieldValue,
'new_value' => $request[$fieldRequest]
];
// save history
ContentHistory::create($history);
}
public function view()
{
$this->viewed++;
app/Models/Content/ModelTraits/ContentHistory.php
+2 -2
View File
@@ -18,7 +18,7 @@ trait ContentHistory
public function getStructuredHistoryOf(Content $content)
{
$data = $content->history()
->select('content_history.*', 'contents.module_handler', 'users.email AS user_email', 'users.name AS user_name')
->select('content_history.*', 'contents.moduleHandler', 'users.email AS user_email', 'users.name AS user_name')
->join('users', 'users.id', '=', 'content_history.user_id')
->join('contents', 'contents.id', '=', 'content_history.content_id')
->orderBy('changed_at', 'DESC')
@@ -61,7 +61,7 @@ trait ContentHistory
*/
// get handler of given content page
$handler = $change->module_handler;
$handler = $change->moduleHandler;
return $handler::getHistoryHandler();
}
app/Models/CustomFields/ModuleHasCustomField.php
+1 -1
View File
@@ -13,7 +13,7 @@ class ModuleHasCustomField extends Model
public $timestamps = false;
protected $fillable = [
'module_handler',
'moduleHandler',
'custom_field_id'
];
app/Models/FileManager/ModelTraits/File.php
+11 -10
View File
@@ -3,7 +3,6 @@
namespace App\Models\FileManager\ModelTraits;
use App\Events\UploadFile;
use App\Http\Requests\Request;
use App\Models\FileManager\File as FileModel;
use Franzose\ClosureTable\Extensions\Str;
use Illuminate\Support\Facades\Auth;
@@ -34,13 +33,15 @@ trait File
* Saves file into FS and creates new record in database
*
* @param UploadedFile $file
* @param Request $request
* @param $data
*
* @return array associative array - key 'file' is type of SymphonyFile and contains info about real file, key 'id'
* is ID of row in files table
*/
public function upload(UploadedFile $file, Request $request)
public function upload(UploadedFile $file, $data = [])
{
$data = (object)$data;
$destination = config('app.upload_path');
$filename = $this->getFilename($file);
@@ -54,7 +55,7 @@ trait File
}
// insert record into database
$id = $this->saveIntoDatabase($uploadedFile, $request, $file->getClientOriginalName());
$id = $this->saveIntoDatabase($uploadedFile, $data, $file->getClientOriginalName());
// fire event about new file
Event::fire(new UploadFile($uploadedFile, $id));
@@ -72,12 +73,12 @@ trait File
* This file saves new record into database. It also calculates hash of given file, obtains MIME type etc.
*
* @param SymphonyFile $file
* @param Request $request
* @param $request
* @param $originalFilename
*
* @return mixed
*/
protected function saveIntoDatabase(SymphonyFile $file, Request $request, $originalFilename)
protected function saveIntoDatabase(SymphonyFile $file, $request, $originalFilename)
{
// get path and hash of uploaded file
$path = config('app.upload_path') . DIRECTORY_SEPARATOR . $file->getFilename();
@@ -92,10 +93,10 @@ trait File
'hash_algorithm' => FileModel::HASH_ALGORITHM,
'mime_type' => $file->getMimeType(),
'file_size' => $file->getSize(),
'name' => $request->name,
'description' => $request->description,
'directory_id' => $request->directoryId ? $request->directoryId : null,
'keywords' => $request->keywords
'name' => isset($request->name) ? $request->name : '',
'description' => isset($request->description) ? $request->description : '',
'directory_id' => isset($request->directoryId) ? $request->directoryId ? $request->directoryId : null : null,
'keywords' => isset($request->keyword) ? $request->keyword : ''
]);
return $newFile->id;
app/Models/ModelTraits/Module.php
+1 -1
View File
@@ -44,7 +44,7 @@ trait Module {
'manages_content' => $managesContent,
'support_categories' => $supportCategories,
'alias' => $alias,
'module_settings' => json_encode($settings),
'moduleSettings' => json_encode($settings),
'parent_id' => $parentModuleId ? $parentModuleId : null,
'enabled' => 1,
'is_template' => $isTemplate
app/Models/Module.php
+1 -1
View File
@@ -17,7 +17,7 @@ class Module extends Model
'name',
'description',
'alias',
'module_settings',
'moduleSettings',
'enabled',
'support_categories',
'manages_content',
app/Models/User.php
+1
View File
@@ -20,6 +20,7 @@ class User extends Model implements AuthenticableInterface
'username',
'password',
'name',
'role'
];
/**
* The attributes excluded from the model's JSON form.
app/Providers/AppServiceProvider.php
+7 -9
View File
@@ -32,18 +32,16 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
// ignore running from artisan
if (App::runningInConsole()) {
return;
}
$this->registerWidgets();
$this->registerSettings();
$this->registerSearch();
$this->app->bind(IContent::class, ContentRepository::class);
$this->app->bind(IModule::class, ModuleRepository::class);
$this->app->bind(ITemplate::class, TemplateRepository::class);
// ignore running from artisan
if (!App::runningInConsole()) {
$this->registerWidgets();
$this->registerSettings();
$this->registerSearch();
}
}
/**
app/Providers/LaravelLocalizationServiceProvider.php
+5 -7
View File
@@ -1,7 +1,5 @@
<?php namespace App\Providers;
use App\Models\Language;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\ServiceProvider;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
@@ -16,14 +14,14 @@ class LaravelLocalizationServiceProvider extends ServiceProvider
$supportedLocales = [];
if (empty($languages)) {
$supportedLocales[config('app.locale')] = [
'native' => env('LOCALE_NATIVE_NAME'),
'script' => env('LOCALE_SCRIPT'),
'name' => env('LOCALE_TRANSLATED_NAME'),
'native' => env('LOCALE_NATIVE_NAME', config('app.locale')),
'script' => env('LOCALE_SCRIPT', 'Latn'),
'name' => env('LOCALE_TRANSLATED_NAME', config('app.locale')),
'code' => config('app.locale'),
];
// create default language
Language::create($supportedLocales[config('app.locale')]);
DB::table('languages')
->insert($supportedLocales[config('app.locale')]);
}
foreach ($languages as $language) {
app/Providers/ModuleManager.php
+4 -4
View File
@@ -26,12 +26,12 @@ class ModuleManager extends ServiceProvider
// iterate over all modules and enable or disable them
foreach ($modules as $module) {
$module->module_settings = json_decode($module->module_settings);
$module->moduleSettings = json_decode($module->moduleSettings);
if ($module->is_template) {
if (isset($module->module_settings->providers) && !empty($module->module_settings->providers)) {
foreach ($module->module_settings->providers as $provider) {
if (isset($module->moduleSettings->providers) && !empty($module->moduleSettings->providers)) {
foreach ($module->moduleSettings->providers as $provider) {
$this->app->register($provider);
}
}
@@ -61,7 +61,7 @@ class ModuleManager extends ServiceProvider
*/
private function createModulesJson(Module $module)
{
$config = $module->module_settings;
$config = $module->moduleSettings;
if (is_null($config)) {
return;
app/Providers/TemplateServiceProvider.php
+12 -7
View File
@@ -2,9 +2,9 @@
namespace App\Providers;
use App\CMS\Contracts\Repositories\Template as TemplateContract;
use App\CMS\Handlers\Registrators\TemplateRegistrator;
use App\CMS\Helpers\CurrentTemplate;
use App\Models\Templates\Template;
use Illuminate\Support\Facades\App;
use Illuminate\Support\ServiceProvider;
@@ -13,7 +13,7 @@ class TemplateServiceProvider extends ServiceProvider
public function boot()
{
// ignore running from artisan
if (App::runningInConsole()) {
if (App::runningInConsole() || App::environment('testing')) {
$this->publishViewResources();
return;
@@ -26,19 +26,24 @@ class TemplateServiceProvider extends ServiceProvider
}
// include files
$files = isset($template->module_settings->files) ? $template->module_settings->files : [];
$files = isset($template->moduleSettings->files) ? $template->moduleSettings->files : [];
foreach ($files as $file) {
include_once $file;
}
// register templates
$publicTemplates = call_user_func([CurrentTemplate::handler(), 'getPublicTemplatePaths']);
$publicTemplates = CurrentTemplate::getPublicTemplatePaths();
if (!is_array($publicTemplates)) {
throw new \ErrorException(CurrentTemplate::handler() . '::getPublicTemplatePaths() must return array!');
}
$this->registerTemplatePaths($publicTemplates);
}
public function registerTemplatePaths($publicTemplates)
{
/**
* @var $registrator TemplateRegistrator
*/
@@ -76,12 +81,12 @@ class TemplateServiceProvider extends ServiceProvider
private function publishViewResources()
{
$template = CurrentTemplate::get();
if (!$template) {
if (!$template || is_null($template->moduleSettings)) {
return;
}
$templateDir = base_path('templates/' . $template->module_settings->staticName . '/Resources');
$assetsDir = $templateDir . '/' . Template::ASSETS_DIRECTORY;
$templateDir = base_path('templates/' . $template->moduleSettings->staticName . '/Resources');
$assetsDir = $templateDir . '/' . TemplateContract::ASSETS_DIRECTORY;
$viewsDir = $templateDir . '/views';
// publish assets if exists for current theme