Skip to content

Commit

Permalink
Improved the frontend components
Browse files Browse the repository at this point in the history
  • Loading branch information
gergo85 committed Apr 24, 2020
1 parent 4d30cd0 commit cd63714
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 19 deletions.
19 changes: 11 additions & 8 deletions classes/SubscriberService.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,22 @@ trait SubscriberService
/**
* Handles subscriber registration
* either by registration in the frontend or by creating in the backend
*
* @param $subscriber
* @param $listOfCategoryIds array of subscribing Ids
* @param $listOfCategoryIds array of subscribing ids
* @return void
*/
public function onSubscriberRegister($subscriber, $listOfCategoryIds = [])
public function onSubscriberRegister($subscriber, $listOfCategoryIds)
{
// Register category
foreach ($listOfCategoryIds as $category) {
if (is_numeric($category) && Categories::where(['id' => $category, 'hidden' => 2])->count() == 1 && Db::table('indikator_news_relations')->where(['subscriber_id' => $subscriber->id, 'categories_id' => $category])->count() == 0) {
Db::table('indikator_news_relations')->insertGetId([
'subscriber_id' => $subscriber->id,
'categories_id' => $category
]);
if (is_array($listOfCategoryIds)) {
foreach ($listOfCategoryIds as $category) {
if (is_numeric($category) && Categories::where(['id' => $category, 'hidden' => 2])->count() == 1 && Db::table('indikator_news_relations')->where(['subscriber_id' => $subscriber->id, 'categories_id' => $category])->count() == 0) {
Db::table('indikator_news_relations')->insertGetId([
'subscriber_id' => $subscriber->id,
'categories_id' => $category
]);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion components/Post.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected function loadPost()
$this->page->meta_image_src = $post->image;

// Create keyword list, from category name and tag list.
$post_keywords = $post->category->name.', ';
$post_keywords = isset($post->category->name) ? $post->category->name.', ' : '';
foreach ($post->tags as $key => $tag) {
$post_keywords .= $tag;
if ($key != (count($post->tags) - 1)) {
Expand Down
18 changes: 9 additions & 9 deletions components/Subscribe.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,39 +42,39 @@ public function onSubscription()

// Validate input data
$rules = [
'name' => 'required|between:2,64',
'email' => 'required|email|between:8,64',
'category' => 'array'
'name' => 'required|between:2,64',
'email' => 'required|email|between:8,64'
];

$validation = Validator::make($data, $rules);
if ($validation->fails()) {
throw new ValidationException($validation);
}

$email = post('email');
// Get input data
$name = post('name');
$email = post('email');
$categories = post('category', []);

// looking for existing subscriber
// Looking for existing subscriber
$subscriberResult = Subscribers::email($email);

if ($subscriberResult->count() > 0) {
$subscriber = $subscriberResult->first();
// Update the name
$subscriber->name = $name;
}
// Register new one
else {
// Register new one
$subscriber = Subscribers::create([
'name' => $name,
'email' => $email,
'common' => '',
'comment' => '',
'locale' => App::getLocale(),
'created' => 2,
'statistics' => 0,
'created_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'),
'created_at' => now(),
'updated_at' => now(),
'registered_at' => now(),
'registered_ip' => Request::ip(),
'status' => 3
Expand Down
2 changes: 1 addition & 1 deletion components/subscribe/default.htm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form data-request="onSubscription" data-request-success="alert('{{ text_messages }}')">
<form data-request="onSubscription" data-request-success="alert('{{ text_messages }}');$('#subscriptionForm').trigger('reset');" id="subscriptionForm">
<div class="form-group">
<label for="subscribersName">{{ text_name }}</label>
<input name="name" type="text" class="form-control" id="subscribersName" required>
Expand Down
1 change: 1 addition & 0 deletions updates/version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,4 @@
1.11.6:
- Improved the list filters.
- common_rename_comment.php
1.11.7: Improved the frontend components.

0 comments on commit cd63714

Please sign in to comment.