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') -
Для поступающих на обучение по программам аспирантуры
-
+
Онлайн-консультации для поступающих и родителей
+
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/aspirantura/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - echo $content; + $PageScrapper = new PageScrapper("https://www.mkgtu.ru/postuplenie/web-consultations/",".content_info"); + + $content = $PageScrapper->normalizePath(); + echo $content; @endphp diff --git a/resources/views/menu/abitur/kolledzh.blade.php b/resources/views/menu/abitur/kolledzh.blade.php index 6d5abe4..f4cb46b 100644 --- a/resources/views/menu/abitur/kolledzh.blade.php +++ b/resources/views/menu/abitur/kolledzh.blade.php @@ -6,11 +6,10 @@
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/kolledzh/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - echo $content; + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/kolledzh/",".content_info"); + + $content = $PageScrapper->normalizePath(); + echo $content; @endphp diff --git a/resources/views/menu/abitur/ordinatura.blade.php b/resources/views/menu/abitur/ordinatura.blade.php index 62e14da..7b8cd43 100644 --- a/resources/views/menu/abitur/ordinatura.blade.php +++ b/resources/views/menu/abitur/ordinatura.blade.php @@ -6,12 +6,9 @@
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/ordinatura/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/ordinatura/",".content_info"); + $content = $PageScrapper->normalizePath(); echo $content; - @endphp
diff --git a/resources/views/menu/abitur/platnye-obrazovatelnye-uslugi.blade.php b/resources/views/menu/abitur/platnye-obrazovatelnye-uslugi.blade.php index 786c3ad..66d5603 100644 --- a/resources/views/menu/abitur/platnye-obrazovatelnye-uslugi.blade.php +++ b/resources/views/menu/abitur/platnye-obrazovatelnye-uslugi.blade.php @@ -6,10 +6,8 @@
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/platnye-obrazovatelnye-uslugi/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/platnye-obrazovatelnye-uslugi/",".content_info"); + $content = $PageScrapper->normalizePath(); echo $content; @endphp diff --git a/resources/views/menu/abitur/spetsialitet-magistratura.blade.php b/resources/views/menu/abitur/spetsialitet-magistratura.blade.php index 289827f..e4f6f51 100644 --- a/resources/views/menu/abitur/spetsialitet-magistratura.blade.php +++ b/resources/views/menu/abitur/spetsialitet-magistratura.blade.php @@ -6,11 +6,9 @@
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/spetsialitet-magistratura-2022/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - echo $content ; + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/spetsialitet-magistratura-2022/",".content_info"); + $content = $PageScrapper->normalizePath(); + echo $content; @endphp diff --git a/resources/views/menu/abitur/videomaterialy-dlya-postupayushchikh.blade.php b/resources/views/menu/abitur/videomaterialy-dlya-postupayushchikh.blade.php index f2fa0c8..d65f716 100644 --- a/resources/views/menu/abitur/videomaterialy-dlya-postupayushchikh.blade.php +++ b/resources/views/menu/abitur/videomaterialy-dlya-postupayushchikh.blade.php @@ -6,16 +6,9 @@
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/videomaterialy-dlya-postupayushchikh/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - -// $content = str_replace( -// 'Обложка Госуслуги_page-0001.jpg', -// 'Обложка Госуслуги_page-0001.jpg', -// $content); - echo $content; + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/videomaterialy-dlya-postupayushchikh/",".content_info"); + $content = $PageScrapper->normalizePath(); + echo $content; @endphp diff --git a/resources/views/menu/abitur/web-consultations.blade.php b/resources/views/menu/abitur/web-consultations.blade.php index bffdc34..8662e5c 100644 --- a/resources/views/menu/abitur/web-consultations.blade.php +++ b/resources/views/menu/abitur/web-consultations.blade.php @@ -4,15 +4,13 @@
-@php - use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://www.mkgtu.ru/postuplenie/web-consultations/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - echo $content; + @php + use App\Services\PageScrapper; + $PageScrapper = new PageScrapper("https://www.mkgtu.ru/postuplenie/web-consultations/",".content_info"); + $content = $PageScrapper->normalizePath(); + echo $content; - @endphp + @endphp
diff --git a/resources/views/menu/course.blade.php b/resources/views/menu/course.blade.php index 8779bd1..43ad193 100644 --- a/resources/views/menu/course.blade.php +++ b/resources/views/menu/course.blade.php @@ -36,28 +36,12 @@
@php - - - - - use DiDom\Document; - - $document = new Document('https://mkgtu.ru/postuplenie/podat-dokumenty-onlayn/', true); - - $posts = $document->find('.content_info'); - - echo $document->first('.content_info')->html(); - /* - use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/podat-dokumenty-onlayn/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - echo $content; - */ - + use App\Services\PageScrapper; + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/podat-dokumenty-onlayn/",".content_info"); + $content = $PageScrapper->printHTML(); + $content = $PageScrapper->normalizePath(); + echo $content; @endphp -
diff --git a/resources/views/menu/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo.blade.php b/resources/views/menu/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo.blade.php index 423ec8e..59acabf 100644 --- a/resources/views/menu/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo.blade.php +++ b/resources/views/menu/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo.blade.php @@ -6,34 +6,18 @@
@php + use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo/akademicheskaya-mobilnost-i-fondy/", '
'); + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo/akademicheskaya-mobilnost-i-fondy/",".content_info"); + $PageScrapper2 = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo/individualnaya-mobilnost-studentov-i-aspirantov/",".content_info"); + $PageScrapper3 = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo/kak-stat-uchastnikom-programm-akademicheskoy-mobilnosti/",".content_info"); - $row = $pageScrapper->getHTML(); - //$tmp = explode('cutHTML($row,'//isU'); - - - $pageScrapper2 = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo/individualnaya-mobilnost-studentov-i-aspirantov/", '
'); - - $row2 = $pageScrapper2->getHTML(); - //$tmp = explode('cutHTML($row2,'//isU'); - - - $pageScrapper3 = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo/kak-stat-uchastnikom-programm-akademicheskoy-mobilnosti/", '
'); - - $row3 = $pageScrapper3->getHTML(); - //$tmp = explode('cutHTML($row3,'//isU'); - - $content = $row . $row2 . $row3; - - //dd($content); - - - //$content = $pageScrapper->cutHTML($row,'//isU'); - // $content = $pageScrapper->normalizeURLFile($content); + $content = '
Академическая мобильность и фонды
'; + $content .= $PageScrapper->normalizePath(); + $content .= '
Индивидуальная мобильность студентов и аспирантов
'; + $content .= $PageScrapper2->normalizePath(); + $content .= '
Как стать участником программ академической мобильности
'; + $content .= $PageScrapper3->normalizePath(); echo $content; diff --git a/resources/views/menu/inostrannym-abiturientam/kafedry.blade.php b/resources/views/menu/inostrannym-abiturientam/kafedry.blade.php index 7885b7e..decaf5f 100644 --- a/resources/views/menu/inostrannym-abiturientam/kafedry.blade.php +++ b/resources/views/menu/inostrannym-abiturientam/kafedry.blade.php @@ -1,16 +1,16 @@ @extends('layouts.applicant-layout') @section('content') +
Кафедры
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/kafedry/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - echo $content; + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/kafedry/",".content_info"); + $content = $PageScrapper->printHTML(); + $content = $PageScrapper->normalizePath(); + echo $content; @endphp diff --git a/resources/views/menu/inostrannym-abiturientam/mezhdunarodnaya-deyatelnost.blade.php b/resources/views/menu/inostrannym-abiturientam/mezhdunarodnaya-deyatelnost.blade.php index a95996e..2787dc0 100644 --- a/resources/views/menu/inostrannym-abiturientam/mezhdunarodnaya-deyatelnost.blade.php +++ b/resources/views/menu/inostrannym-abiturientam/mezhdunarodnaya-deyatelnost.blade.php @@ -1,19 +1,26 @@ + @extends('layouts.applicant-layout') + @section('content') +
Международная деятельность
-
+
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/mezhdunarodnaya-deyatelnost/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - echo $content; + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/mezhdunarodnaya-deyatelnost/",".content_info"); + $content = $PageScrapper->printHTML(); + $content = $PageScrapper->normalizePath(); + echo $content; @endphp
@endsection + diff --git a/resources/views/menu/inostrannym-abiturientam/obshchie-svedeniya.blade.php b/resources/views/menu/inostrannym-abiturientam/obshchie-svedeniya.blade.php index 2d26872..70787ce 100644 --- a/resources/views/menu/inostrannym-abiturientam/obshchie-svedeniya.blade.php +++ b/resources/views/menu/inostrannym-abiturientam/obshchie-svedeniya.blade.php @@ -1,19 +1,25 @@ @extends('layouts.applicant-layout') @section('content') +
Общие сведения
-
+
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/obshchie-svedeniya/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - echo $content; + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/obshchie-svedeniya/",".content_info"); + $content = $PageScrapper->printHTML(); + $content = $PageScrapper->normalizePath(); + echo $content; @endphp
@endsection + + diff --git a/resources/views/menu/inostrannym-abiturientam/tsentr-mezhdunarodnogo-obrazovaniya.blade.php b/resources/views/menu/inostrannym-abiturientam/tsentr-mezhdunarodnogo-obrazovaniya.blade.php index 74b6529..8022cf4 100644 --- a/resources/views/menu/inostrannym-abiturientam/tsentr-mezhdunarodnogo-obrazovaniya.blade.php +++ b/resources/views/menu/inostrannym-abiturientam/tsentr-mezhdunarodnogo-obrazovaniya.blade.php @@ -1,16 +1,16 @@ @extends('layouts.applicant-layout') @section('content') +
Центр Международного образования
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/tsentr-mezhdunarodnogo-obrazovaniya/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - echo $content; + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/tsentr-mezhdunarodnogo-obrazovaniya/",".content_info"); + $content = $PageScrapper->printHTML(); + $content = $PageScrapper->normalizePath(); + echo $content; @endphp diff --git a/resources/views/menu/olimpiady-dlya-shkolnikov.blade.php b/resources/views/menu/olimpiady-dlya-shkolnikov.blade.php index 017051d..3006fb0 100644 --- a/resources/views/menu/olimpiady-dlya-shkolnikov.blade.php +++ b/resources/views/menu/olimpiady-dlya-shkolnikov.blade.php @@ -1,5 +1,8 @@ @extends('layouts.applicant-layout') + @section('content') + +
Олимпиады для школьников
{{-- пофиксить!!!!--}}
@@ -7,20 +10,9 @@
@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/olimpiady-dlya-shkolnikov/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); - -// $tmp = preg_match_all('/

/isU', "https://mkgtu.ru/postuplenie/olimpiady-dlya-shkolnikov/", $arr); -// -// $arr[0] = array_unique($arr[0]); -// $str = $arr[0][0]; - $content = str_replace('

', '

', $content); - - - - + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/olimpiady-dlya-shkolnikov/",".content_info"); + $content = $PageScrapper->printHTML(); + $content = $PageScrapper->normalizePath(); echo $content; @endphp diff --git a/resources/views/menu/paid_edu.blade.php b/resources/views/menu/paid_edu.blade.php index 6f89bce..c0db6ae 100644 --- a/resources/views/menu/paid_edu.blade.php +++ b/resources/views/menu/paid_edu.blade.php @@ -5,7 +5,7 @@ - + @endsection @section('content') @@ -15,10 +15,9 @@

@php use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/sveden/paid_edu/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); + $PageScrapper = new PageScrapper("https://mkgtu.ru/sveden/paid_edu/",".content_info"); + $content = $PageScrapper->printHTML(); + $content = $PageScrapper->normalizePath(); echo $content; @endphp diff --git a/resources/views/menu/podgotovitelnye-kursy.blade.php b/resources/views/menu/podgotovitelnye-kursy.blade.php index 03ada84..1f6924b 100644 --- a/resources/views/menu/podgotovitelnye-kursy.blade.php +++ b/resources/views/menu/podgotovitelnye-kursy.blade.php @@ -2,15 +2,14 @@ @section('content')
Подготовительные курсы
-
+
@php - use App\Services\PageScrapper; - $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/podgotovitelnye-kursy/", '
'); - $row = $pageScrapper->getHTML(); - $content = $pageScrapper->normalizeURLFile($row); - $content = $pageScrapper->cutHTML($content,'//isU'); + use App\Services\PageScrapper; + $PageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/podgotovitelnye-kursy/",".content_info"); + $content = $PageScrapper->printHTML(); + $content = $PageScrapper->normalizePath(); echo $content; @endphp