chuckbe / chuckcms

src/Controllers/FrontEndController.php

Spacing +14 added lines, -14 removed lines

@@ -45,45 +45,45 @@ 
 
     public function index($slug = null)
     {
-        if($slug == null){
+        if ($slug == null) {
             $page = $this->page->where('isHp', 1)->firstOrFail();
-        } elseif($slug !== null){
+        } elseif ($slug !== null) {
             
             $redirect = $this->redirect->where('slug', $slug)->first();
-            if($redirect !== null){
+            if ($redirect !== null) {
                 return redirect($redirect->to, $redirect->type);
             }
 
             $repeater = $this->repeater->where('url', $slug)->first();
-            if($repeater !== null){
+            if ($repeater !== null) {
                 $templateHintpath = explode('::', $repeater->page)[0];
                 $template = $this->template->where('active', 1)->where('hintpath', $templateHintpath)->first();
                 return view($repeater->page, compact('template', 'repeater'));
             }
 
-            $page = $this->page->where('slug->'.app()->getLocale(), $slug)->first();
-            if($page == null){
-               foreach(\LaravelLocalization::getSupportedLocales() as $localeCode => $properties){
-                    $page = $this->page->where('slug->'.$localeCode, $slug)->first();
-                    if($page !== null && $localeCode == app()->getLocale()) break;
+            $page = $this->page->where('slug->' . app()->getLocale(), $slug)->first();
+            if ($page == null) {
+               foreach (\LaravelLocalization::getSupportedLocales() as $localeCode => $properties) {
+                    $page = $this->page->where('slug->' . $localeCode, $slug)->first();
+                    if ($page !== null && $localeCode == app()->getLocale()) break;
 
-                    if($page !== null && $localeCode !== app()->getLocale()){
+                    if ($page !== null && $localeCode !== app()->getLocale()) {
                         //dd(app()->getLocale());
                         app()->setLocale($localeCode); 
                         \LaravelLocalization::setLocale($localeCode);
                         
-                        return redirect($localeCode.'/'.$slug);
+                        return redirect($localeCode . '/' . $slug);
                     } 
                 } 
             }
 
-            if($page == null) abort(404);
+            if ($page == null) abort(404);
         }
         
         $ogpageblocks = $this->pageblock->getAllByPageId($page->id);
         $pageblocks = $this->pageBlockRepository->getRenderedByPageBlocks($ogpageblocks);
         
-        if($page->page !== null) {
+        if ($page->page !== null) {
             $template = $this->template->where('active', 1)->where('hintpath', explode('::', $page->page)[0])->first();
 
             return view($page->page, compact('template', 'page', 'pageblocks'));
@@ -91,6 +91,6 @@ 
 
         $template = $this->template->where('active', 1)->where('id', $page->template_id)->first();
         
-        return view($template->hintpath.'::templates.'.$template->slug.'.page', compact('template', 'page', 'pageblocks'));
+        return view($template->hintpath . '::templates.' . $template->slug . '.page', compact('template', 'page', 'pageblocks'));
     }
 }

src/Controllers/FormController.php

Spacing +8 added lines, -8 removed lines

@@ -55,7 +55,7 @@ 
         $form_slug = $request->get('form_slug');
         $fields_slug = $request->get('fields_slug');
 
-        for ($i=0; $i < count($fields_slug); $i++) { 
+        for ($i = 0; $i < count($fields_slug); $i++) { 
             $form['fields'][$form_slug . '_' . $fields_slug[$i]]['label'] = $request->get('fields_label')[$i];
             $form['fields'][$form_slug . '_' . $fields_slug[$i]]['type'] = $request->get('fields_type')[$i];
             $form['fields'][$form_slug . '_' . $fields_slug[$i]]['class'] = $request->get('fields_class')[$i];
@@ -64,15 +64,15 @@ 
             $form['fields'][$form_slug . '_' . $fields_slug[$i]]['validation'] = $request->get('fields_validation')[$i];
             $form['fields'][$form_slug . '_' . $fields_slug[$i]]['value'] = $request->get('fields_value')[$i];
 
-            for ($k=0; $k < count(explode(';',$request->get('fields_attributes_name')[$i])); $k++) { 
-                $form['fields'][$form_slug . '_' . $fields_slug[$i]]['attributes'][explode(';',$request->get('fields_attributes_name')[$i])[$k]] = explode(';',$request->get('fields_attributes_value')[$i])[$k];
+            for ($k = 0; $k < count(explode(';', $request->get('fields_attributes_name')[$i])); $k++) { 
+                $form['fields'][$form_slug . '_' . $fields_slug[$i]]['attributes'][explode(';', $request->get('fields_attributes_name')[$i])[$k]] = explode(';', $request->get('fields_attributes_value')[$i])[$k];
             }
             $form['fields'][$form_slug . '_' . $fields_slug[$i]]['required'] = $request->get('fields_required')[$i];
         }
 
         $form['actions']['store'] = $request->get('action_store');
-        if($request->get('action_send') == true) {
-            for ($g=0; $g < count($request->get('action_send_slug')); $g++) { 
+        if ($request->get('action_send') == true) {
+            for ($g = 0; $g < count($request->get('action_send_slug')); $g++) { 
                 $form['actions']['send'][$request->get('action_send_slug')[$g]]['to'] = $request->get('action_send_to')[$g];
                 $form['actions']['send'][$request->get('action_send_slug')[$g]]['to_name'] = $request->get('action_send_to_name')[$g];
                 $form['actions']['send'][$request->get('action_send_slug')[$g]]['from'] = $request->get('action_send_from')[$g];
@@ -110,14 +110,14 @@ 
         $rules = $form->getRules();
         $this->validate(request(), $rules);
         $store = $form->storeEntry($request);
-        if($store !== 'error'){
+        if ($store !== 'error') {
             //send emails 
-            foreach($form->form['actions']['send'] as $sendKey => $sendValue){
+            foreach ($form->form['actions']['send'] as $sendKey => $sendValue) {
                 $mailData = $form->getMailData($sendValue, $request, $store);
                 Mail::send(new FormActionMail($mailData));
             }
             return redirect()->to($form->form['actions']['redirect']);
-        }else {
+        } else {
             // error catching ... ?
         }
         

src/Controllers/UserController.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 
     public function invite(Request $request)
     {
-        $this->validate(request(), [ //@todo create custom Request class for page validation
+        $this->validate(request(), [//@todo create custom Request class for page validation
             'name' => 'max:185|required',
             'email' => 'email|required|unique:users',
             'role' => 'required|in:user,moderator,administrator,super-admin'
@@ -92,7 +92,7 @@ 
 
     public function activate(Request $request)
     {
-        $this->validate(request(), [ //@todo create custom Request class for user password validation
+        $this->validate(request(), [//@todo create custom Request class for user password validation
             'password' => 'required|min:8|regex:/^.*(?=.{3,})(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[\d\X])(?=.*[!$#%]).*$/',
             'password_again' => 'required|same:password',
             '_user_token' => 'required',
@@ -130,14 +130,14 @@ 
 
     public function save(Request $request)
     {
-        $this->validate(request(), [ //@todo create custom Request class for page validation
+        $this->validate(request(), [//@todo create custom Request class for page validation
             'name' => 'max:185|required',
             'email' => 'email|required',
             'role' => 'required|in:user,moderator,administrator,super-admin'
         ]);
 
         // update the user
-        $user = $this->user->create([ // TODO CHANGE TO UPDATE METHOD
+        $user = $this->user->create([// TODO CHANGE TO UPDATE METHOD
             'name' => $request->get('name'),
             'email' => $request->get('email'),
             'token' => $this->userRepository->createToken(),

src/Models/Page.php

Spacing +10 added lines, -10 removed lines

@@ -12,11 +12,11 @@ 
 {
 	use HasTranslations;
 
-    public function template(){
+    public function template() {
     	return $this->belongsTo('Chuckbe\Chuckcms\Models\Template');
     }
 
-    public function page_blocks(){
+    public function page_blocks() {
     	return $this->hasMany('Chuckbe\Chuckcms\Models\PageBlock')->orderBy('order');
     }
 
@@ -35,7 +35,7 @@ 
         $page = new Page();
 
         $meta = [];
-        foreach(ChuckSite::getSupportedLocales() as $langKey => $langValue){
+        foreach (ChuckSite::getSupportedLocales() as $langKey => $langValue) {
             $page->setTranslation('title', $langKey, $values->get('page_title')[$langKey]);
             $page->setTranslation('slug', $langKey, $values->get('page_slug')[$langKey]);
             
@@ -47,13 +47,13 @@ 
             $meta[$langKey]['og-title'] = $values->get('meta_title')[$langKey];
             $meta[$langKey]['og-description'] = $values->get('meta_description')[$langKey];
             $meta[$langKey]['og-site_name'] = $values->get('meta_title')[$langKey];
-            if($values->get('meta_robots_index')[$langKey] == '1') {
+            if ($values->get('meta_robots_index')[$langKey] == '1') {
                 $index = 'index, ';
             } else {
                 $index = 'noindex, ';
             }
 
-            if($values->get('meta_robots_follow')[$langKey] == '1') {
+            if ($values->get('meta_robots_follow')[$langKey] == '1') {
                 $follow = 'follow';
             } else {
                 $follow = 'nofollow';
@@ -61,7 +61,7 @@ 
 
             $meta[$langKey]['robots'] = $index . $follow;
             $meta[$langKey]['googlebots'] = $index . $follow;
-            for ($i=0; $i < count($values->get('meta_key')[$langKey]); $i++) { 
+            for ($i = 0; $i < count($values->get('meta_key')[$langKey]); $i++) { 
                 $meta[$langKey][$values->get('meta_key')[$langKey][$i]] = $values->get('meta_value')[$langKey][$i];
             }
         }
@@ -80,10 +80,10 @@ 
         $page = $this->getById($values['page_id']);
         
         $meta = [];
-        foreach(ChuckSite::getSupportedLocales() as $langKey => $langValue){
+        foreach (ChuckSite::getSupportedLocales() as $langKey => $langValue) {
             $page->setTranslation('title', $langKey, $values->get('page_title')[$langKey]);
             $page->setTranslation('slug', $langKey, $values->get('page_slug')[$langKey]);
-            for ($i=0; $i < count($values->get('meta_key')[$langKey]); $i++) { 
+            for ($i = 0; $i < count($values->get('meta_key')[$langKey]); $i++) { 
                 $meta[$langKey][$values->get('meta_key')[$langKey][$i]] = $values->get('meta_value')[$langKey][$i];
             }
         }
@@ -100,9 +100,9 @@ 
     public function deleteById($id)
     {
         $page = $this->where('id', $id)->first();
-        if($page){
+        if ($page) {
             PageBlock::where('page_id', $page->id)->delete();
-            if($page->delete()){
+            if ($page->delete()) {
                 return 'success';
             } else {
                 return 'error';

src/Models/Menus.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     protected $table = 'menus';
 
-    public function __construct( array $attributes = [] ){
+    public function __construct(array $attributes = []) {
     	//parent::construct( $attributes );
     	$this->table = config('menu.table_prefix') . config('menu.table_name_menus');
     }

src/Models/Content.php

Spacing +12 added lines, -12 removed lines

@@ -29,7 +29,7 @@ 
     public function getRules()
     {
         $rules = [];
-        foreach($this->content['fields'] as $fieldKey => $fieldValue){
+        foreach ($this->content['fields'] as $fieldKey => $fieldValue) {
             $rules[$fieldKey] = $fieldValue['validation'];
         }
         return $rules;
@@ -38,8 +38,8 @@ 
     public function storeEntry($input)
     {
         $slug = $input->get('content_slug');
-        if(is_array($this->content['actions']['detail'])){
-            if(array_key_exists('url', $this->content['actions']['detail'])) {
+        if (is_array($this->content['actions']['detail'])) {
+            if (array_key_exists('url', $this->content['actions']['detail'])) {
                 $url = $this->getUrlFromInput($this->content['actions']['detail']['url'], $input);    
                 $page = $this->content['actions']['detail']['page'];
             } else {
@@ -53,16 +53,16 @@ 
         
         
         $json = [];
-        foreach($this->content['fields'] as $fieldKey => $fieldValue){
-            if($fieldValue['type'] !== 'file'){
-                $cleanKey = str_replace($slug.'_', '', $fieldKey);
+        foreach ($this->content['fields'] as $fieldKey => $fieldValue) {
+            if ($fieldValue['type'] !== 'file') {
+                $cleanKey = str_replace($slug . '_', '', $fieldKey);
                 $json[$cleanKey] = $input->get($fieldKey);
             }
         }
         
-        if($this->content['files'] == 'true'){
-            foreach($this->content['fields'] as $fieldKey => $fieldValue){
-                if($fieldValue['type'] == 'file'){
+        if ($this->content['files'] == 'true') {
+            foreach ($this->content['fields'] as $fieldKey => $fieldValue) {
+                if ($fieldValue['type'] == 'file') {
                     //@todo save input files
                 }
             }
@@ -83,7 +83,7 @@ 
     {
         $repeater = Repeater::where('id', $id)->first();
         
-        if($repeater->delete()){
+        if ($repeater->delete()) {
             return 'success';
         } else {
             return 'error';
@@ -94,8 +94,8 @@ 
     {
         $fields = $this->getContents($url, '[', ']');
         $finalUrl = $url;
-        foreach($fields as $field){
-            $finalUrl = str_replace('['.$field.']', $input->get($field), $finalUrl);
+        foreach ($fields as $field) {
+            $finalUrl = str_replace('[' . $field . ']', $input->get($field), $finalUrl);
         }
         return $finalUrl;
     }

src/Models/Template.php

Spacing +13 added lines, -13 removed lines

@@ -6,7 +6,7 @@ 
 
 class Template extends Eloquent
 {
-    public function pages(){
+    public function pages() {
     	return $this->hasMany('Chuckbe\Chuckcms\Models\Page');
     }
 
@@ -31,22 +31,22 @@ 
         $templates = $this->where('active', 1)->where('type', 'default')->get();
         $emailTemplates = [];
         foreach ($templates as $template) {
-            if(file_exists(base_path('vendor/'.$template->path.'/src/views/templates/'.$template->slug.'/mails'))){
-                $mailDir = array_slice(scandir(base_path('vendor/'.$template->path.'/src/views/templates/'.$template->slug.'/mails')), 2);
+            if (file_exists(base_path('vendor/' . $template->path . '/src/views/templates/' . $template->slug . '/mails'))) {
+                $mailDir = array_slice(scandir(base_path('vendor/' . $template->path . '/src/views/templates/' . $template->slug . '/mails')), 2);
                 if (count($mailDir) > 0) {
                     $emailTemplates[$template->slug]['hintpath'] = $template->hintpath;
-                    foreach($mailDir as $mdKey => $mdValue) {
+                    foreach ($mailDir as $mdKey => $mdValue) {
                         if (strpos($mdValue, '.blade.php')) {
                             $emailTemplates[$template->slug]['files'][] = str_replace('.blade.php', '', $mdValue);
                         }    
                     }
                 }
             }
-            if(file_exists(base_path('resources/views/vendor/'.$template->slug.'/templates/'.$template->slug.'/mails'))){
-                $mailDirVendor = array_slice(scandir(base_path('resources/views/vendor/'.$template->slug.'/templates/'.$template->slug.'/mails')), 2);
+            if (file_exists(base_path('resources/views/vendor/' . $template->slug . '/templates/' . $template->slug . '/mails'))) {
+                $mailDirVendor = array_slice(scandir(base_path('resources/views/vendor/' . $template->slug . '/templates/' . $template->slug . '/mails')), 2);
                 if (count($mailDirVendor) > 0) {
                     $emailTemplates[$template->slug]['hintpath'] = $template->hintpath;
-                    foreach($mailDirVendor as $mdKey => $mdValue) {
+                    foreach ($mailDirVendor as $mdKey => $mdValue) {
                         if (strpos($mdValue, '.blade.php')) {
                             $emailTemplates[$template->slug]['files'][] = str_replace('.blade.php', '', $mdValue);
                         }    
@@ -62,22 +62,22 @@ 
         $templates = $this->where('active', 1)->where('type', 'default')->get();
         $pageViews = [];
         foreach ($templates as $template) {
-            if(file_exists(base_path('vendor/'.$template->path.'/src/views/templates/'.$template->slug))){
-                $pageDir = array_slice(scandir(base_path('vendor/'.$template->path.'/src/views/templates/'.$template->slug)), 2);
+            if (file_exists(base_path('vendor/' . $template->path . '/src/views/templates/' . $template->slug))) {
+                $pageDir = array_slice(scandir(base_path('vendor/' . $template->path . '/src/views/templates/' . $template->slug)), 2);
                 if (count($pageDir) > 0) {
                     $pageViews[$template->slug]['hintpath'] = $template->hintpath;
-                    foreach($pageDir as $pdKey => $pdValue) {
+                    foreach ($pageDir as $pdKey => $pdValue) {
                         if (strpos($pdValue, '.blade.php')) {
                             $pageViews[$template->slug]['files'][] = str_replace('.blade.php', '', $pdValue);
                         }    
                     }
                 }
             }
-            if(file_exists(base_path('resources/views/vendor/'.$template->slug.'/templates/'.$template->slug))){
-                $pageDir = array_slice(scandir(base_path('resources/views/vendor/'.$template->slug.'/templates/'.$template->slug)), 2);
+            if (file_exists(base_path('resources/views/vendor/' . $template->slug . '/templates/' . $template->slug))) {
+                $pageDir = array_slice(scandir(base_path('resources/views/vendor/' . $template->slug . '/templates/' . $template->slug)), 2);
                 if (count($pageDir) > 0) {
                     $pageViews[$template->slug]['hintpath'] = $template->hintpath;
-                    foreach($pageDir as $pdKey => $pdValue) {
+                    foreach ($pageDir as $pdKey => $pdValue) {
                         if (strpos($pdValue, '.blade.php')) {
                             $pageViews[$template->slug]['files'][] = str_replace('.blade.php', '', $pdValue);
                         }    

src/Models/Form.php

Spacing +22 added lines, -22 removed lines

@@ -29,7 +29,7 @@ 
     public function getRules()
     {
         $rules = [];
-        foreach($this->form['fields'] as $fieldKey => $fieldValue){
+        foreach ($this->form['fields'] as $fieldKey => $fieldValue) {
             $rules[$fieldKey] = $fieldValue['validation'];
         }
         $rules['chuckpot'] = 'honeypot';
@@ -39,25 +39,25 @@ 
 
     public function storeEntry($input)
     {
-        if($this->form['actions']['store'] == 'true'){
+        if ($this->form['actions']['store'] == 'true') {
             $entry = new FormEntry();
             $entry->slug = $input->get('_form_slug');
             $json = [];
-            foreach($this->form['fields'] as $fieldKey => $fieldValue){
-                if($fieldValue['type'] !== 'file'){
+            foreach ($this->form['fields'] as $fieldKey => $fieldValue) {
+                if ($fieldValue['type'] !== 'file') {
                     $json[$fieldKey] = $input->get($fieldKey);
                 }
             }
-            if($this->form['files'] == 'true'){
-                foreach($this->form['fields'] as $fieldKey => $fieldValue){
-                    if($fieldValue['type'] == 'file'){
-                        if($input->hasFile($fieldKey)){
+            if ($this->form['files'] == 'true') {
+                foreach ($this->form['fields'] as $fieldKey => $fieldValue) {
+                    if ($fieldValue['type'] == 'file') {
+                        if ($input->hasFile($fieldKey)) {
                             $avatar = $input->file($fieldKey);
                             $filename = time() . '.' . $avatar->getClientOriginalExtension();
                             if (!file_exists(public_path('/files/uploads/'))) {
                                 mkdir(public_path('/files/uploads/'), 0777, true);
                             }
-                            $avatar->move( public_path('/files/uploads/'), $filename );
+                            $avatar->move(public_path('/files/uploads/'), $filename);
                             $filepath = '/files/uploads/' . $filename;
                         } else {
                             $filepath = null;
@@ -67,12 +67,12 @@ 
                 }
             }
             $entry->entry = $json;
-            if($entry->save()){
+            if ($entry->save()) {
                 return $entry;
             } else {
                 return 'error';
             }
-        }else {
+        } else {
             return 'pass';
         }
     }
@@ -80,9 +80,9 @@ 
     public function deleteById($id)
     {
         $form = $this->where('id', $id)->first();
-        if($form){
+        if ($form) {
             FormEntry::where('slug', $form->slug)->delete();
-            if($form->delete()){
+            if ($form->delete()) {
                 return 'success';
             } else {
                 return 'error';
@@ -95,9 +95,9 @@ 
     public function deleteBySlug($slug)
     {
         $form = $this->where('slug', $slug)->first();
-        if($form){
+        if ($form) {
             FormEntry::where('slug', $slug)->delete();
-            if($form->delete()){
+            if ($form->delete()) {
                 return 'success';
             } else {
                 return 'error';
@@ -110,12 +110,12 @@ 
     public function getMailData($sendData, $input, $entry)
     {
         $mailData = [];
-        foreach($sendData as $sendKey => $sendValue){
+        foreach ($sendData as $sendKey => $sendValue) {
             $findThis = $this->getResources($sendValue, '[', ']');
-            if(count($findThis) > 0){
+            if (count($findThis) > 0) {
             
-                foreach($findThis as $founded){
-                    if(strpos($founded, $input->get('_form_slug')) !== false) {
+                foreach ($findThis as $founded) {
+                    if (strpos($founded, $input->get('_form_slug')) !== false) {
                         $sendValue = str_replace('[' . $founded . ']', $input->get($founded), $sendValue);
                     }
                 }
@@ -126,10 +126,10 @@ 
             }
 
             $mailData[$sendKey] = $inputData;
-            if($sendKey == 'files' && $sendValue == 'true') {
+            if ($sendKey == 'files' && $sendValue == 'true') {
                 $mailData[$sendKey] = [];
-                foreach($this->form['fields'] as $fKey => $fValue) {
-                    if($fValue['type'] == 'file') {
+                foreach ($this->form['fields'] as $fKey => $fValue) {
+                    if ($fValue['type'] == 'file') {
                         $mailData[$sendKey][] = $entry->entry[$fKey];
                     }
                 }

src/Models/Resource.php

Spacing +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
         'json' => 'array',
     ];
 
-    protected $fillable = ['slug','json'];
+    protected $fillable = ['slug', 'json'];
 }