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
modules/Blog/Article/Handlers/Article.php
+10 -18
View File
@@ -5,7 +5,6 @@ use App\CMS\Contracts\Content\AdvancedContentModifier;
use App\CMS\Contracts\Content\ContentTitles;
use App\CMS\Contracts\Modules\InstallableModule;
use App\CMS\Handlers\Handler;
use App\Http\Controllers\Admin\Contents\EditContent;
use App\Http\Controllers\Controller;
use App\Http\Requests\Request;
use App\Models\ActionLog\ActionLogType;
@@ -27,7 +26,7 @@ class Article extends Handler implements ContentTitles, AdvancedContentModifier,
public function render(Content $content, $parameters)
{
$content->comments = [];
if (isset($content->module_settings->allowComments) && $content->module_settings->allowComments) {
if (isset($content->moduleSettings->allowComments) && $content->moduleSettings->allowComments) {
$content->comments = Comment::where('content_id', $content->id)
->with('author')
->where('approved', 1)
@@ -62,7 +61,7 @@ class Article extends Handler implements ContentTitles, AdvancedContentModifier,
*/
public static function createNew(Content &$content, Request $request)
{
$content->module_settings = json_encode(['allowComments' => (int)$request->has('allowComments')]);
$content->moduleSettings = ['allowComments' => (int)$request->has('allowComments')];
}
/**
@@ -73,23 +72,18 @@ class Article extends Handler implements ContentTitles, AdvancedContentModifier,
* @param Content $content
* @param Request $request
*
* @param $revisionID string ID of revision used
*
* @return int number of edited fields
* @return void
*/
public static function edit(Content &$content, Request $request, $revisionID)
public static function edit(Content $content, $request)
{
$fields = ['allowComments' => 'allowComments'];
$settings = $content->moduleSettings;
if (!is_object($settings))
$settings = new \stdClass();
// get data and try to save them
$data = EditContent::getFields($request, $fields);
$settings->allowComments = isset($request['allowComments']) ? (int)$request['allowComments'] : 0;
$data['allowComments'] = (int)$data['allowComments'];
list($revision, $changedColumns) = $content->updateWithHistory($fields, $data, $revisionID);
// return amount of changed columns
return $changedColumns;
$content->moduleSettings = $settings;
$content->save();
}
/**
@@ -99,8 +93,6 @@ class Article extends Handler implements ContentTitles, AdvancedContentModifier,
*/
public static function registerAdminMenu(User $user)
{
parent::registerAdminMenu($user);
$menu = \Menu::instance('mainMenu');
$blogSubmenu = $menu->whereTitle(trans('article::module.blog'));
modules/Blog/Article/Http/Controllers/Visitor/CreateNewComment.php
+3 -3
View File
@@ -14,12 +14,12 @@ class CreateNewComment extends Controller
public function postNew(\Modules\Blog\Article\Http\Requests\CreateNewComment $request, $articleId)
{
$article = Content::where('id', $articleId)
->where('module_handler', Article::class)
->where('moduleHandler', Article::class)
->firstOrFail();
$article->module_settings = json_decode($article->module_settings);
$article->moduleSettings = json_decode($article->moduleSettings);
if (!isset($article->module_settings->allowComments) || !$article->module_settings->allowComments) {
if (!isset($article->moduleSettings->allowComments) || !$article->moduleSettings->allowComments) {
return redirect()
->route('page.content', ['url' => $article->url])
->with('error', trans('article::comments.disabledComments'));
modules/Blog/Article/Resources/views/admin/content/basicInfo.blade.php
+6 -6
View File
@@ -37,12 +37,12 @@
@include('admin.snippets.hasError', ['field' => 'status'])
</div>
<div class="col-lg-4">
<select class="form-control" name="parentPage">
<select class="form-control" name="parentId">
<option value="">@lang('admin/contents.noParentPage')</option>
@foreach($rootPages as $rootPage)
<option value="{{$rootPage->id}}"
@if(old('parent_page', $page->parent_id) == $rootPage->id) selected @endif>
@if(old('parentId', $page->parentId) == $rootPage->id) selected @endif>
{{$rootPage->title}}
</option>
@endforeach
@@ -54,7 +54,7 @@
<div class="col-lg-2 text-center">
<label>
<input class="checkbox" value="1"
@if(old('allowComments', isset($page->module_settings->allowComments) ? $page->module_settings->allowComments : true)) checked
@if(old('allowComments', isset($page->moduleSettings->allowComments) ? $page->moduleSettings->allowComments : true)) checked
@endif name="allowComments" type="checkbox">
<span>@lang('article::article.allowComments')</span>
</label>
@@ -62,11 +62,11 @@
@if($module->support_categories && count($categories))
<div class="col-lg-12">
<select class="form-control" name="category">
<select class="form-control" name="categoryId">
<option value="">@lang('admin/contents.noCategory')</option>
@foreach($categories as $category)
<option value="{{$category->id}}"
@if($category->id == old('category', $page->category_id)) selected @endif>
@if($category->id == old('categoryId', $page->categoryId)) selected @endif>
{{str_repeat(' - ', $category->real_depth)}} {{$category->name}}
</option>
@endforeach
@@ -78,7 +78,7 @@
<div class="row">
<div class="col-lg-12">
<textarea name="pageContent" id="pageContent" class="wysiwyg-editor">
{{old('pageContent', $page->content)}}
{{old('pageContent', $page->pageContent)}}
</textarea>
</div>
</div>
modules/Blog/ArticleList/Handlers/ArticleList.php
+7 -7
View File
@@ -96,18 +96,18 @@ class ArticleList extends Handler
*/
public function render(Content $content, $parameters)
{
$articles = ArticleModel::where('module_handler', Article::class)
$articles = ArticleModel::where('moduleHandler', Article::class)
->with('comments')
->with('category')
->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');
})
->orderBy('published_from', 'DESC')
->orderBy('publishedFrom', 'DESC')
->orderBy('created_at', 'DESC');
// show articles for not-logged users of even for logged onew?
@@ -135,7 +135,7 @@ class ArticleList extends Handler
// decode module settings
foreach ($articles as $article) {
$article->module_settings = json_decode($article->module_settings);
$article->moduleSettings = json_decode($article->moduleSettings);
}
return Controller::VisitorsView($content->template, [
modules/ContactForm/Handlers/ContactForm.php
+3 -3
View File
@@ -40,7 +40,7 @@ class ContactForm extends Handler implements ContentTitles, AdvancedContentModif
];
// save settings
$content->module_settings = json_encode($settings);
$content->moduleSettings = json_encode($settings);
}
/**
@@ -55,7 +55,7 @@ class ContactForm extends Handler implements ContentTitles, AdvancedContentModif
*
* @return int number of edited fields
*/
public static function edit(Content &$content, Request $request, $revisionID)
public static function edit(Content $content, $request)
{
$fields = [
'phone' => 'phone',
@@ -70,7 +70,7 @@ class ContactForm extends Handler implements ContentTitles, AdvancedContentModif
// get data and try to save them
$data = EditContent::getFields($request, $fields);
list($revision, $changedColumns) = $content->updateWithHistory($fields, $data, $revisionID);
list($revision, $changedColumns) = $content->updateWithHistory($fields, $data);
// return amount of changed columns
return $changedColumns;
modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php
+5 -5
View File
@@ -21,22 +21,22 @@ class CreateNewMessage extends Controller
public function postMessage(SendNewEmailRequest $request, $formId)
{
// load form settings
$form = Content::where('module_handler', config('contactform.handler'))
$form = Content::where('moduleHandler', config('contactform.handler'))
->findOrFail($formId);
$form->module_settings = json_decode($form->module_settings);
$form->moduleSettings = json_decode($form->moduleSettings);
// select template
$template = isset($form->module_settings->emailTemplate) ? $form->module_settings->emailTemplate : 'contactform::emails.default';
$template = isset($form->moduleSettings->emailTemplate) ? $form->moduleSettings->emailTemplate : 'contactform::emails.default';
// send email
$status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
$message->from($request->email, $request->name);
// get message subject
$subject = isset($form->module_settings->subject) ? $form->module_settings->subject : trans('contactform::admin/contents.defaultSubject');
$subject = isset($form->moduleSettings->subject) ? $form->moduleSettings->subject : trans('contactform::admin/contents.defaultSubject');
$message->to($form->module_settings->email)
$message->to($form->moduleSettings->email)
->subject($subject);
});
modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php
+10 -10
View File
@@ -55,11 +55,11 @@
@if($module->support_categories && count($categories))
<div class="col-lg-12">
<select class="form-control" name="category">
<select class="form-control" name="categoryId">
<option value="">@lang('admin/contents.noCategory')</option>
@foreach($categories as $category)
<option value="{{$category->id}}"
@if($category->id == old('category', $page->category_id)) selected @endif>
@if($category->id == old('categoryId', $page->categoryId)) selected @endif>
{{str_repeat(' - ', $category->real_depth)}} {{$category->name}}
</option>
@endforeach
@@ -77,26 +77,26 @@
@lang('contactform::admin/content.email')
</label>
<input class="form-control" type="email" name="email" value="{{$page->module_settings->email or ""}}" />
<input class="form-control" type="email" name="email" value="{{$page->moduleSettings->email or ""}}" />
<label class="label-control">
@lang('contactform::admin/content.phone')
</label>
<input class="form-control" type="tel" name="phone" value="{{$page->module_settings->phone or ""}}" />
<input class="form-control" type="tel" name="phone" value="{{$page->moduleSettings->phone or ""}}" />
<label class="label-control">
@lang('contactform::admin/content.compName')
</label>
<input class="form-control" type="text" name="companyName"
value="{{$page->module_settings->companyName or ""}}" />
value="{{$page->moduleSettings->companyName or ""}}" />
<label class="label-control">
@lang('contactform::admin/content.address')
</label>
<textarea rows="3" class="form-control" name="address">{{$page->module_settings->address or ""}}</textarea>
<textarea rows="3" class="form-control" name="address">{{$page->moduleSettings->address or ""}}</textarea>
</div>
<div class="column col-lg-6">
@@ -105,14 +105,14 @@
</label>
<input class="form-control" type="email" name="contactEmail"
value="{{$page->module_settings->contactEmail or \Auth::user()->email}}" />
value="{{$page->moduleSettings->contactEmail or \Auth::user()->email}}" />
<label class="label-control">
@lang('contactform::admin/content.subject')
</label>
<input class="form-control" type="text" name="subject"
value="{{$page->module_settings->subject or trans('contactform::admin/content.defaultSubject')}}" />
value="{{$page->moduleSettings->subject or trans('contactform::admin/content.defaultSubject')}}" />
<div class="row">
<div class="column col-lg-6">
@@ -120,7 +120,7 @@
@lang('contactform::admin/content.gpsLat')
</label>
<input class="form-control" type="text" value="{{$page->module_settings->gpsLat or ""}}"
<input class="form-control" type="text" value="{{$page->moduleSettings->gpsLat or ""}}"
name="gpsLat" />
</div>
<div class="column col-lg-6">
@@ -128,7 +128,7 @@
@lang('contactform::admin/content.gpsLng')
</label>
<input class="form-control" type="text" value="{{$page->module_settings->gpsLng or ""}}"
<input class="form-control" type="text" value="{{$page->moduleSettings->gpsLng or ""}}"
name="gpsLng" />
</div>
</div>
modules/ContactForm/Widgets/Address/Presenter.php
+3 -3
View File
@@ -24,7 +24,7 @@ class Presenter implements WidgetRenderer
if (!$form)
return null;
$formData = json_decode($form->module_settings);
$formData = json_decode($form->moduleSettings);
$code = '<div class="address-widget ' . e($widget->container_class) . '"';
if ($widget->container_id) {
@@ -47,7 +47,7 @@ class Presenter implements WidgetRenderer
*/
public static function renderAddForm(WidgetType $type)
{
$contactForms = Content::where('module_handler', config('contactform.handler'))
$contactForms = Content::where('moduleHandler', config('contactform.handler'))
->get();
return view('contactform::admin.widgets.address.new', [
@@ -66,7 +66,7 @@ class Presenter implements WidgetRenderer
*/
public static function renderEditForm(Widget $widget)
{
$contactForms = Content::where('module_handler', config('contactform.handler'))
$contactForms = Content::where('moduleHandler', config('contactform.handler'))
->get();
return view('contactform::admin.widgets.address.edit', [
'widget' => $widget,
modules/ContactForm/Widgets/Form/Presenter.php
+3 -3
View File
@@ -32,7 +32,7 @@ class Presenter implements WidgetRenderer
return null;
}
$form->module_settings = json_decode($form->module_settings);
$form->moduleSettings = json_decode($form->moduleSettings);
return view(self::$template, ['widget' => $widget, 'form' => $form]);
}
@@ -46,7 +46,7 @@ class Presenter implements WidgetRenderer
*/
public static function renderAddForm(WidgetType $type)
{
$contactForms = Content::where('module_handler', config('contactform.handler'))
$contactForms = Content::where('moduleHandler', config('contactform.handler'))
->get();
return view('contactform::admin.widgets.form.new', [
@@ -65,7 +65,7 @@ class Presenter implements WidgetRenderer
*/
public static function renderEditForm(Widget $widget)
{
$contactForms = Content::where('module_handler', config('contactform.handler'))
$contactForms = Content::where('moduleHandler', config('contactform.handler'))
->get();
return view('contactform::admin.widgets.address.edit', [
'widget' => $widget,
modules/Gallery/Handlers/Gallery.php
+9 -9
View File
@@ -29,7 +29,7 @@ class Gallery implements AppHandler
public function render(Content $content, $parameters)
{
// get directory ID
$directoryId = $content->module_settings->directoryId;
$directoryId = $content->moduleSettings->directoryId;
// get all images in given directory
$images = File::where('directory_id', $directoryId)
@@ -56,12 +56,12 @@ class Gallery implements AppHandler
*/
public static function loadExtraData(Content $content)
{
if (is_string($content->module_settings)) {
$content->module_settings = json_decode($content->module_settings);
if (is_string($content->moduleSettings)) {
$content->moduleSettings = json_decode($content->moduleSettings);
}
$extra = [
'slider' => isset($content->module_settings->slider) ? $content->module_settings->slider : false
'slider' => isset($content->moduleSettings->slider) ? $content->moduleSettings->slider : false
];
return $extra;
@@ -91,7 +91,7 @@ class Gallery implements AppHandler
$settings = ['directoryId' => $directory->id];
// save settings
$content->module_settings = json_encode($settings);
$content->moduleSettings = json_encode($settings);
}
/**
@@ -224,13 +224,13 @@ class Gallery implements AppHandler
*/
public static function delete(Content $content)
{
// try to convert module_settings into something more accessible
if (is_string($content->module_settings)) {
$content->module_settings = json_decode($content->module_settings);
// try to convert moduleSettings into something more accessible
if (is_string($content->moduleSettings)) {
$content->moduleSettings = json_decode($content->moduleSettings);
}
// get directory id
$directoryId = $content->module_settings->directoryId;
$directoryId = $content->moduleSettings->directoryId;
$directory = Directory::find($directoryId);
modules/Gallery/Resources/views/admin/content/editUpload.blade.php
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="row column">
<a href="{{route('upload.overview', ['id' => $page->module_settings->directoryId])}}" class="button large expanded success">@lang('gallery::admin/content.upload')</a>
<a href="{{route('upload.overview', ['id' => $page->moduleSettings->directoryId])}}" class="button large expanded success">@lang('gallery::admin/content.upload')</a>
</div>
<div class="row column text-center">