diff --git a/app/Services/PageScrapper.php b/app/Services/PageScrapper.php index e3ac583..46b4880 100644 --- a/app/Services/PageScrapper.php +++ b/app/Services/PageScrapper.php @@ -88,14 +88,47 @@ class PageScrapper } public function normalizePath() { - $links = (string) $this->document->find('a[href]'); - dd($links); - foreach ($links as $link) { - if (!str_starts_with($link, 'https')) { - $this->document = str_replace($link, 'https://mkgtu.ru' . $link, $this->document); + $rez = $this->document; + $content = $rez->first($this->contentMarker); + $links = $content->find('a[href]'); + $srclinks = $content->find('img[src]'); + + + $html0 = $content->html(); + foreach ($links as $k => $link) { + $href = $link->attr('href'); + + if (!str_contains($link->attr('href'), "https://")) { + + + $tmp = explode('/', rawurldecode($href)); + foreach ( $tmp as $k => $v) { + $tmp[$k] = rawurlencode($v); + } + $href = implode('/', $tmp); + + + $html0 = str_replace($href, 'https://mkgtu.ru' . $href, $html0); } } + foreach ($srclinks as $k => $srclink) { + $src = $srclink->attr('src'); - return $this->document; + if (!str_contains($srclink->attr('src'), "https://")) { + + + $tmp = explode('/', rawurldecode($src)); + foreach ( $tmp as $k => $v) { + $tmp[$k] = rawurlencode($v); + } + $src = implode('/', $tmp); + + + $html0 = str_replace($src, 'https://mkgtu.ru' . $src, $html0); + } + } + str_replace('st yle', 'style', $html0); + + return $html0; } } diff --git a/resources/views/layouts/applicant-layout.blade.php b/resources/views/layouts/applicant-layout.blade.php index cb7e71f..a51ecdc 100644 --- a/resources/views/layouts/applicant-layout.blade.php +++ b/resources/views/layouts/applicant-layout.blade.php @@ -319,9 +319,27 @@ - - + + + + @yield('content') diff --git a/resources/views/menu/abitur/aspirantura.blade.php b/resources/views/menu/abitur/aspirantura.blade.php index aaf63ec..5a70006 100644 --- a/resources/views/menu/abitur/aspirantura.blade.php +++ b/resources/views/menu/abitur/aspirantura.blade.php @@ -1,16 +1,16 @@ @extends('layouts.applicant-layout') + @section('content') -