chuckbe / chuckcms

src/Commands/GenerateSite.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 
         if ($validator->fails()) {
             $messages = $validator->errors();
-            foreach($messages->all() as $message) {
+            foreach ($messages->all() as $message) {
                 $this->error($message);
             }
         } else {
@@ -112,7 +112,7 @@ 
             $this->info('..         ..');
             $this->info('.         .');
             $this->info(' ');
-            $this->info('New site: '.$name.' ('.$domain.') generated successfully');
+            $this->info('New site: ' . $name . ' (' . $domain . ') generated successfully');
             $this->info(' ');
         }
 

src/Chuck/PageBlockRepository.php

Indentation +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
         $contentStart += $startDelimiterLength;
         $contentEnd = strpos($str, $endDelimiter, $contentStart);
         if (false === $contentEnd) {
-          break;
+            break;
         }
         $contents[] = substr($str, $contentStart, $contentEnd - $contentStart);
         $startFrom = $contentEnd + $endDelimiterLength;

Spacing +29 added lines, -29 removed lines

@@ -27,13 +27,13 @@ 
     public function getRenderedByPageBlocks($ogpageblocks)
     {
         $pageblocks = [];
-        foreach($ogpageblocks as $pageblock){
+        foreach ($ogpageblocks as $pageblock) {
             $body = $pageblock->body;
             $findUrlTags = $this->getResources($body, '[%', '%]');
             $url = env('APP_URL', ChuckSite::getSetting('domain'));
-            if(count($findUrlTags) > 0) {
-                foreach($findUrlTags as $foundUrlTag) {
-                    if(strpos($foundUrlTag, 'URL') !== false) {
+            if (count($findUrlTags) > 0) {
+                foreach ($findUrlTags as $foundUrlTag) {
+                    if (strpos($foundUrlTag, 'URL') !== false) {
                         $body = str_replace('[%URL%]', $url, $body);
                     }
                 }
@@ -43,23 +43,23 @@ 
             $findThis = $this->getResources($body, '[', ']');
             
             // THERE ARE DYNAMICS IN THIS PAGEBLOCK, LET'S RETRIEVE IT
-            if(count($findThis) > 0){
+            if (count($findThis) > 0) {
                 //@todo LOOP OVER findThis variable and resolve order for rendering
                 
                 // PAGEBLOCK CONTAINS A LOOP, LET'S RETRIEVE IT
                 if (strpos($findThis[0], 'LOOP') !== false) {
-                    $repeater_slug = implode(" ",$this->getResources($body, '[LOOP=', ']'));
-                    $repeater_body = implode(" ",$this->getResources($body, '[LOOP='.$repeater_slug.']', '[/LOOP]'));
+                    $repeater_slug = implode(" ", $this->getResources($body, '[LOOP=', ']'));
+                    $repeater_body = implode(" ", $this->getResources($body, '[LOOP=' . $repeater_slug . ']', '[/LOOP]'));
                     
-                    $newbody = str_replace('[LOOP='.$repeater_slug.']'.$repeater_body.'[/LOOP]',$this->getRepeaterContents($repeater_slug, $repeater_body),$body);
+                    $newbody = str_replace('[LOOP=' . $repeater_slug . ']' . $repeater_body . '[/LOOP]', $this->getRepeaterContents($repeater_slug, $repeater_body), $body);
 
                 // THERE IS NO LOOP, CONTINUE
-                }elseif(strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT
-                    $form_slug = implode(" ",$this->getResources($body, '[FORM=', ']'));
+                }elseif (strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT
+                    $form_slug = implode(" ", $this->getResources($body, '[FORM=', ']'));
                     
-                    $newbody = $this->getFormHtml($form_slug,$body);
-                }else{// THERE IS NO FORM, SO JUST RETRIEVE THE DYNAMIC CONTENT
-                    $newbody = $this->getResourceContent($findThis, $pageblock->id, $body);//Maybe write a function in the model?    
+                    $newbody = $this->getFormHtml($form_slug, $body);
+                } else {// THERE IS NO FORM, SO JUST RETRIEVE THE DYNAMIC CONTENT
+                    $newbody = $this->getResourceContent($findThis, $pageblock->id, $body); //Maybe write a function in the model?    
                 }
             } else {
                 $newbody = $body;
@@ -82,9 +82,9 @@ 
         $body = $pageblock->body;
         $findUrlTags = $this->getResources($body, '[%', '%]');
         $url = env('APP_URL', ChuckSite::getSetting('domain'));
-        if(count($findUrlTags) > 0) {
-            foreach($findUrlTags as $foundUrlTag) {
-                if(strpos($foundUrlTag, 'URL') !== false) {
+        if (count($findUrlTags) > 0) {
+            foreach ($findUrlTags as $foundUrlTag) {
+                if (strpos($foundUrlTag, 'URL') !== false) {
                     $body = str_replace('[%URL%]', $url, $body);
                 }
             }
@@ -92,23 +92,23 @@ 
 
         $findThis = $this->getResources($body, '[', ']');
         // THERE ARE DYNAMICS IN THIS PAGEBLOCK, LET'S RETRIEVE IT
-        if(count($findThis) > 0){
+        if (count($findThis) > 0) {
             //@todo LOOP OVER findThis variable and resolve order for rendering
             
             // PAGEBLOCK CONTAINS A LOOP, LET'S RETRIEVE IT
             if (strpos($findThis[0], 'LOOP') !== false) {
-                $repeater_slug = implode(" ",$this->getResources($body, '[LOOP=', ']'));
-                $repeater_body = implode(" ",$this->getResources($body, '[LOOP='.$repeater_slug.']', '[/LOOP]'));
+                $repeater_slug = implode(" ", $this->getResources($body, '[LOOP=', ']'));
+                $repeater_body = implode(" ", $this->getResources($body, '[LOOP=' . $repeater_slug . ']', '[/LOOP]'));
                 
-                $newbody = str_replace('[LOOP='.$repeater_slug.']'.$repeater_body.'[/LOOP]',$this->getRepeaterContents($repeater_slug, $repeater_body),$body);
+                $newbody = str_replace('[LOOP=' . $repeater_slug . ']' . $repeater_body . '[/LOOP]', $this->getRepeaterContents($repeater_slug, $repeater_body), $body);
 
             // THERE IS NO LOOP, CONTINUE
-            }elseif(strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT
-                $form_slug = implode(" ",$this->getResources($body, '[FORM=', ']'));
+            }elseif (strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT
+                $form_slug = implode(" ", $this->getResources($body, '[FORM=', ']'));
                 
-                $newbody = $this->getFormHtml($form_slug,$body);
-            } else{// THERE IS NO FORM, SO JUST RETRIEVE THE DYNAMIC CONTENT
-                $newbody = $this->getResourceContent($findThis, $pageblock->id, $body);//Maybe write a function in the model?    
+                $newbody = $this->getFormHtml($form_slug, $body);
+            } else {// THERE IS NO FORM, SO JUST RETRIEVE THE DYNAMIC CONTENT
+                $newbody = $this->getResourceContent($findThis, $pageblock->id, $body); //Maybe write a function in the model?    
             }
         } else {
             $newbody = $body;
@@ -154,7 +154,7 @@ 
     public function getResourceContent($resources, $page_block_id, $page_block_body)
     {
         $body = $page_block_body;
-        foreach($resources as $resource){
+        foreach ($resources as $resource) {
             $res_arr = explode('+', $resource);
             $res_slug = (string)$res_arr[0];
             $res_json = (string)$res_arr[1];
@@ -190,7 +190,7 @@ 
         $resources = $this->getResources($page_block_body, '[' . $slug . '+', ']');
         $new_body = [];
         $i = 0;
-        foreach($contents as $content){
+        foreach ($contents as $content) {
             $body = $page_block_body;
             foreach ($resources as $resource) {
                 $json = $content->json;
@@ -245,12 +245,12 @@ 
     public function deleteById($id)
     {
         $pageblock = $this->pageblock->find($id);
-        if($pageblock){
+        if ($pageblock) {
             $og_order = $pageblock->order;
             //Decrement order of following pageblocks
             $pageblocks = $this->pageblock->where('page_id', $pageblock->page_id)->where('order', '>', $og_order)->decrement('order');
             //Delete pageblock
-            if($pageblock->delete()){
+            if ($pageblock->delete()) {
                 return 'success';
             } else {
                 return 'error';

Braces +3 added lines, -3 removed lines

@@ -54,11 +54,11 @@ 
                     $newbody = str_replace('[LOOP='.$repeater_slug.']'.$repeater_body.'[/LOOP]',$this->getRepeaterContents($repeater_slug, $repeater_body),$body);
 
                 // THERE IS NO LOOP, CONTINUE
-                }elseif(strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT
+                } elseif(strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT
                     $form_slug = implode(" ",$this->getResources($body, '[FORM=', ']'));
                     
                     $newbody = $this->getFormHtml($form_slug,$body);
-                }else{// THERE IS NO FORM, SO JUST RETRIEVE THE DYNAMIC CONTENT
+                } else{// THERE IS NO FORM, SO JUST RETRIEVE THE DYNAMIC CONTENT
                     $newbody = $this->getResourceContent($findThis, $pageblock->id, $body);//Maybe write a function in the model?    
                 }
             } else {
@@ -103,7 +103,7 @@ 
                 $newbody = str_replace('[LOOP='.$repeater_slug.']'.$repeater_body.'[/LOOP]',$this->getRepeaterContents($repeater_slug, $repeater_body),$body);
 
             // THERE IS NO LOOP, CONTINUE
-            }elseif(strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT
+            } elseif(strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT
                 $form_slug = implode(" ",$this->getResources($body, '[FORM=', ']'));
                 
                 $newbody = $this->getFormHtml($form_slug,$body);

src/Chuck/UserRepository.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 class UserRepository
 {
-	public function __construct(User $user)
+    public function __construct(User $user)
     {
         $this->user = $user;
     }

src/Chuck/SiteRepository.php

Indentation +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
     public static function updateOrCreateFromRequest($req)
     {
-    	$settings = [];
+        $settings = [];
         foreach ($req->get('socialmedia') as $smKey => $smValue) {
             $settings['socialmedia'][$smKey] = $smValue;
         }

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         foreach ($req->get('integrations') as $igsKey => $igsValue) {
             $settings['integrations'][$igsKey] = $igsValue;
         }
-        $settings['lang'] = implode(",",$req->get('lang'));
+        $settings['lang'] = implode(",", $req->get('lang'));
         $settings['domain'] = $req->get('site_domain'); //@todo remove domain from table only keep json
         
         // updateOrCreate the site

src/Chuck/Accessors/Site.php

Spacing +6 added lines, -6 removed lines

@@ -45,8 +45,8 @@ 
         $settings = $site->settings;
         $locales = [];
         if ($settings !== null) { 
-            foreach(config('lang.allLocales') as $langKey => $langValue){
-                if( in_array($langKey, explode(',',$settings['lang']) ) ){
+            foreach (config('lang.allLocales') as $langKey => $langValue) {
+                if (in_array($langKey, explode(',', $settings['lang']))) {
                     $locales[$langKey] = $langValue;
                 }
             }
@@ -92,7 +92,7 @@ 
     {
         $split = explode('.', $var);
         foreach ($split as $value) {
-            if(array_key_exists($value, $settings)) {
+            if (array_key_exists($value, $settings)) {
                 $settings = $settings[$value];
             } else {
                 return null;
@@ -104,13 +104,13 @@ 
 
     private function resolveSiteAttribute($var, $currentSite)
     {
-        if($var == 'domain') {
+        if ($var == 'domain') {
             return $currentSite->domain;
         }
-        if($var == 'name') {
+        if ($var == 'name') {
             return $currentSite->name;
         }
-        if($var == 'slug') {
+        if ($var == 'slug') {
             return $currentSite->slug;
         }
     }

src/Chuck/Accessors/Menu.php

Spacing +5 added lines, -5 removed lines

@@ -35,13 +35,13 @@ 
         $menus = $menuitems->getall(1);
 
         $data = ['menus' => $menus, 'indmenu' => $menu];
-        if($tslug == null) {
+        if ($tslug == null) {
             return view('chuckcms::vendor.chuck-menu.menu-front-end', $data);
         }
-        if($fileslug == null){
-            return view($tslug.'::vendor.chuck-menu.menu-front-end', $data);
+        if ($fileslug == null) {
+            return view($tslug . '::vendor.chuck-menu.menu-front-end', $data);
         }
-        return view($tslug.'::vendor.chuck-menu.' . $fileslug, $data);
+        return view($tslug . '::vendor.chuck-menu.' . $fileslug, $data);
     }
 
     public function scripts()
@@ -75,7 +75,7 @@ 
         $menuItem = new MenuItems;
         $menu_list = $menuItem->getall($menu_id);
 
-        $roots = $menu_list->where('menu', (integer) $menu_id)->where('parent', 0);
+        $roots = $menu_list->where('menu', (integer)$menu_id)->where('parent', 0);
 
         $items = self::tree($roots, $menu_list);
         return $items;

src/Mail/UserActivationMail.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     {
         return $this->from($this->mailData['from'], $this->mailData['from_name'])
                     ->to($this->mailData['to'], $this->mailData['to_name'])
-                    ->subject('Activeer je account op '.$this->settings['domain'])
+                    ->subject('Activeer je account op ' . $this->settings['domain'])
                     ->view('chuckcms::backend.mails.userActivationMail');
     }
 }

src/Mail/FormActionMail.php

Spacing +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@
                     ->to($this->mailData['to'], $this->mailData['to_name'])
                     ->subject($this->mailData['subject'])
                     ->view($this->mailData['template']);
-        if(is_array($this->mailData['files'])) {
-            foreach($this->mailData['files'] as $file) {
-                if($file !== null) {
+        if (is_array($this->mailData['files'])) {
+            foreach ($this->mailData['files'] as $file) {
+                if ($file !== null) {
                     $mail->attach(public_path($file));    
                 }
             }

src/Controllers/PageController.php

Indentation +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
                         $blockKey = str_replace('.html', '', $value);
                         $blockName = str_replace('-', ' ', $blockKey);
                         if (file_exists($dir . DIRECTORY_SEPARATOR . $blockKey . '.jpg')) {
-                           $blockImage = $dir . DIRECTORY_SEPARATOR . $blockKey . '.jpg';
+                            $blockImage = $dir . DIRECTORY_SEPARATOR . $blockKey . '.jpg';
                         } elseif (file_exists($dir . DIRECTORY_SEPARATOR . $blockKey . '.jpeg')) {
                             $blockImage = $dir . DIRECTORY_SEPARATOR . $blockKey . '.jpeg';
                         } elseif (file_exists($dir . DIRECTORY_SEPARATOR . $blockKey . '.png')) {

Spacing +8 added lines, -8 removed lines

@@ -101,12 +101,12 @@ 
      */
     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
             'page_title' => 'max:185',
         ]);
-        if($request['create']){
+        if ($request['create']) {
             $page = $this->page->create($request);
-        } if($request['update']){
+        } if ($request['update']) {
             $page = $this->page->updatePage($request);
         }
         return redirect()->route('dashboard.pages');
@@ -119,7 +119,7 @@ 
      */
     public function delete(Request $request)
     {
-        $this->validate(request(), [ //@todo create custom Request class for page validation
+        $this->validate(request(), [//@todo create custom Request class for page validation
             'page_id' => 'required',
         ]);
         
@@ -138,8 +138,8 @@ 
         $template = $this->template->where('id', $page->template_id)->where('type', 'default')->first();
         $pageblocks = $this->pageBlockRepository->getRenderedByPageBlocks($this->pageblock->getAllByPageId($page->id));
 
-        $block_dir = array_slice(scandir('chuckbe/'.$template->slug.'/blocks'), 2);        
-        $blocks = $this->dirToArray($template->path.'/blocks');
+        $block_dir = array_slice(scandir('chuckbe/' . $template->slug . '/blocks'), 2);        
+        $blocks = $this->dirToArray($template->path . '/blocks');
         
         return view('chuckcms::backend.pages.pagebuilder.index', compact('template', 'page', 'pageblocks', 'blocks'));
     }
@@ -151,12 +151,12 @@ 
         $cdir = scandir($dir); 
         foreach ($cdir as $key => $value) 
         { 
-            if (!in_array($value,array(".",".."))) { 
+            if (!in_array($value, array(".", ".."))) { 
                 if (is_dir($dir . DIRECTORY_SEPARATOR . $value)) { 
                     $result[$value] = $this->dirToArray($dir . DIRECTORY_SEPARATOR . $value); 
                 } 
                 else { 
-                    if ($value !== '.DS_Store' && (strpos($value, '.html') !== false) ) {
+                    if ($value !== '.DS_Store' && (strpos($value, '.html') !== false)) {
                         $blockKey = str_replace('.html', '', $value);
                         $blockName = str_replace('-', ' ', $blockKey);
                         if (file_exists($dir . DIRECTORY_SEPARATOR . $blockKey . '.jpg')) {

Braces +1 added lines, -2 removed lines

@@ -154,8 +154,7 @@
             if (!in_array($value,array(".",".."))) { 
                 if (is_dir($dir . DIRECTORY_SEPARATOR . $value)) { 
                     $result[$value] = $this->dirToArray($dir . DIRECTORY_SEPARATOR . $value); 
-                } 
-                else { 
+                } else { 
                     if ($value !== '.DS_Store' && (strpos($value, '.html') !== false) ) {
                         $blockKey = str_replace('.html', '', $value);
                         $blockName = str_replace('-', ' ', $blockKey);