@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | $newbody = str_replace('[LOOP=' . $repeater_slug . ']' . $repeater_body . '[/LOOP]', $this->getRepeaterContents($repeater_slug, $repeater_body), $body); |
| 55 | 55 | |
| 56 | 56 | // THERE IS NO LOOP, CONTINUE |
| 57 | - }elseif (strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT |
|
| 57 | + } elseif (strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT |
|
| 58 | 58 | $form_slug = implode(" ", $this->getResources($body, '[FORM=', ']')); |
| 59 | 59 | |
| 60 | 60 | $newbody = $this->getFormHtml($form_slug, $body); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | $newbody = str_replace('[LOOP=' . $repeater_slug . ']' . $repeater_body . '[/LOOP]', $this->getRepeaterContents($repeater_slug, $repeater_body), $body); |
| 104 | 104 | |
| 105 | 105 | // THERE IS NO LOOP, CONTINUE |
| 106 | - }elseif (strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT |
|
| 106 | + } elseif (strpos($findThis[0], 'FORM') !== false) {// PAGEBLOCK CONTAINS A FORM, LET'S RETRIEVE IT |
|
| 107 | 107 | $form_slug = implode(" ", $this->getResources($body, '[FORM=', ']')); |
| 108 | 108 | |
| 109 | 109 | $newbody = $this->getFormHtml($form_slug, $body); |
@@ -154,8 +154,7 @@ |
||
| 154 | 154 | if (!in_array($value, array(".", ".."))) { |
| 155 | 155 | if (is_dir($dir . DIRECTORY_SEPARATOR . $value)) { |
| 156 | 156 | $result[$value] = $this->dirToArray($dir . DIRECTORY_SEPARATOR . $value); |
| 157 | - } |
|
| 158 | - else { |
|
| 157 | + } else { |
|
| 159 | 158 | if ($value !== '.DS_Store' && (strpos($value, '.html') !== false)) { |
| 160 | 159 | $blockKey = str_replace('.html', '', $value); |
| 161 | 160 | $blockName = str_replace('-', ' ', $blockKey); |
@@ -23,9 +23,9 @@ |
||
| 23 | 23 | |
| 24 | 24 | public function getRenderedById($pageblock_id, PageBlockRepository $pageBlockRepository) |
| 25 | 25 | { |
| 26 | - $pageblock = $this->where('id', $pageblock_id)->first(); |
|
| 27 | - $new_pageblock = $pageBlockRepository->getRenderedByPageBlock($pageblock); |
|
| 28 | - return $new_pageblock; |
|
| 26 | + $pageblock = $this->where('id', $pageblock_id)->first(); |
|
| 27 | + $new_pageblock = $pageBlockRepository->getRenderedByPageBlock($pageblock); |
|
| 28 | + return $new_pageblock; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | public function getById($id) |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | { |
| 9 | 9 | protected $user; |
| 10 | 10 | |
| 11 | - public function __construct(User $user) |
|
| 11 | + public function __construct(User $user) |
|
| 12 | 12 | { |
| 13 | 13 | $this->user = $user; |
| 14 | 14 | } |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | if($page == null) { |
| 87 | - abort(404); |
|
| 87 | + abort(404); |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | }); |
| 168 | 168 | |
| 169 | 169 | Route::group(['middleware' => ['permission:delete resource']], function () { |
| 170 | - Route::post('/dashboard/content/resources/delete', 'Chuckbe\Chuckcms\Controllers\ContentController@resourceDelete')->name('dashboard.content.resources.delete'); |
|
| 170 | + Route::post('/dashboard/content/resources/delete', 'Chuckbe\Chuckcms\Controllers\ContentController@resourceDelete')->name('dashboard.content.resources.delete'); |
|
| 171 | 171 | }); |
| 172 | 172 | |
| 173 | 173 | // Dashboard Content Repeaters Routes... |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | }); |
| 188 | 188 | |
| 189 | 189 | Route::group(['middleware' => ['permission:delete repeaters']], function () { |
| 190 | - Route::post('/dashboard/content/repeaters/delete', 'Chuckbe\Chuckcms\Controllers\ContentController@repeaterDelete')->name('dashboard.content.repeaters.delete'); |
|
| 190 | + Route::post('/dashboard/content/repeaters/delete', 'Chuckbe\Chuckcms\Controllers\ContentController@repeaterDelete')->name('dashboard.content.repeaters.delete'); |
|
| 191 | 191 | }); |
| 192 | 192 | // Dashboard Content Repeaters Entries Routes... |
| 193 | 193 | Route::group(['middleware' => ['permission:show repeaters entries']], function () { |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | Route::get('/dashboard/users/edit/{user}', 'Chuckbe\Chuckcms\Controllers\UserController@edit')->name('dashboard.users.edit'); |
| 224 | 224 | }); |
| 225 | 225 | |
| 226 | - Route::group(['middleware' => ['permission:delete users']], function () { |
|
| 226 | + Route::group(['middleware' => ['permission:delete users']], function () { |
|
| 227 | 227 | Route::post('/dashboard/user/delete', 'Chuckbe\Chuckcms\Controllers\UserController@delete')->name('dashboard.user.delete'); |
| 228 | 228 | }); |
| 229 | 229 | // Dashboard Roles Routes... |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | 'settings' => $settings] |
| 70 | 70 | ]; |
| 71 | 71 | |
| 72 | - // updateOrCreate the site |
|
| 72 | + // updateOrCreate the site |
|
| 73 | 73 | $result = Site::updateOrCreate( |
| 74 | 74 | ['id' => $req['id']], |
| 75 | 75 | ['name' => $req['name'], |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | * |
| 30 | 30 | * @return void |
| 31 | 31 | */ |
| 32 | - public function __construct(Site $site, SiteRepository $siteRepository, User $user) |
|
| 32 | + public function __construct(Site $site, SiteRepository $siteRepository, User $user) |
|
| 33 | 33 | {
|
| 34 | 34 | $this->site = $site; |
| 35 | 35 | $this->siteId = ChuckSite::getSetting('integrations.matomo-site-id');
|
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | if($checkforrange !== 0){
|
| 75 | 75 | $period = 'range'; |
| 76 | 76 | $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
| 77 | - }else{
|
|
| 77 | + } else{
|
|
| 78 | 78 | if($diff == 6){
|
| 79 | 79 | $period = 'week'; |
| 80 | 80 | $date = 'last7'; |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * |
| 29 | 29 | * @return void |
| 30 | 30 | */ |
| 31 | - public function __construct(Site $site, SiteRepository $siteRepository, User $user) |
|
| 31 | + public function __construct(Site $site, SiteRepository $siteRepository, User $user) |
|
| 32 | 32 | {
|
| 33 | 33 | $this->site = $site; |
| 34 | 34 | $this->siteId = ChuckSite::getSetting('integrations.matomo-site-id');
|
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | if($checkforrange !== 0){
|
| 61 | 61 | $period = 'range'; |
| 62 | 62 | $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
| 63 | - }else{
|
|
| 63 | + } else{
|
|
| 64 | 64 | if($diff == 6){
|
| 65 | 65 | $period = 'week'; |
| 66 | 66 | $date = 'last7'; |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | ->setParameter('filter_limit', -1)
|
| 201 | 201 | ->execute() |
| 202 | 202 | ->getResponse(); |
| 203 | - }else{
|
|
| 203 | + } else{
|
|
| 204 | 204 | $recordedSessions = []; |
| 205 | 205 | } |
| 206 | 206 | |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | $period = 'range'; |
| 276 | 276 | $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
| 277 | 277 | $imgDate = $date; |
| 278 | - }else{
|
|
| 278 | + } else{
|
|
| 279 | 279 | $imgDate = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
| 280 | 280 | if($diff == 6){
|
| 281 | 281 | $period = 'week'; |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | $period = 'range'; |
| 341 | 341 | $date = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
| 342 | 342 | $imgDate = $date; |
| 343 | - }else{
|
|
| 343 | + } else{
|
|
| 344 | 344 | $imgDate = $data["value"]["y2"].'-'.$data["value"]["m2"].'-'.$data["value"]["d2"].','.$data["value"]["y1"].'-'.$data["value"]["m1"].'-'.$data["value"]["d1"]; |
| 345 | 345 | if($diff == 6){
|
| 346 | 346 | $period = 'week'; |