Changeset 938 for trunk

Timestamp:

Jul 30, 2022, 12:10:48 AM (2 years ago)

Author:

chronos

Message:

• Fixed: Not working news import due to PHP SSL bug.
• Added: News import from zdechov.net site.

Location:

trunk

Files:

• Common/Global.php (modified) (1 diff)
• Modules/News/Import/Vismo.php (modified) (2 diffs)
• Modules/News/Import/ZdechovNET.php (added)
• Modules/News/News.php (modified) (1 diff)
• Modules/News/NewsSource.php (modified) (1 diff)

trunk/Common/Global.php

@@ -382 +382 @@
   return call_user_func_array('pack', array_merge(array($v), (array)$a));
 }
+
+function file_get_contents_curl(string $Url)
+{
+  $Ch = curl_init();
+
+  curl_setopt($Ch, CURLOPT_AUTOREFERER, TRUE);
+  curl_setopt($Ch, CURLOPT_HEADER, 0);
+  curl_setopt($Ch, CURLOPT_RETURNTRANSFER, 1);
+  curl_setopt($Ch, CURLOPT_URL, $Url);
+  curl_setopt($Ch, CURLOPT_FOLLOWLOCATION, TRUE);
+
+  $Data = curl_exec($Ch);
+  curl_close($Ch);
+  return $Data;
+}

trunk/Modules/News/Import/Vismo.php

@@ -3 +3 @@
 class NewsSourceVismo extends NewsSource
 {
+
   function Import(): string
   {
     $Output = parent::Import();
-    $Content = file_get_contents($this->URL);
+    $Content = file_get_contents_curl($this->URL);
 
     $BlockStart = '<h2 class="cvi text-to-speech">Přehled dokumentů</h2>';
@@ -26 +27 @@
       $NewsItem->Link = GetUrlBase($this->URL).html_entity_decode(GetTextBetween($Item, '<a href="', '">'));
       $NewsItem->Title = html_entity_decode(GetTextBetween($Item, '', '</a>'));
-      $NewsItem->Date = GetTextBetween($Item, '<span>(', ')</span>');
-      $NewsItem->Date = HumanDateToTime($NewsItem->Date);
+      $Date = GetTextBetween($Item, '<span>(', ')</span>');
+      $NewsItem->Date = HumanDateToTime($Date);
       $NewsItem->Category = $this->Category;
       if (strpos($Item, '<div>') !== false)

trunk/Modules/News/News.php

@@ -4 +4 @@
 include_once(dirname(__FILE__).'/NewsSource.php');
 include_once(dirname(__FILE__).'/Import/Vismo.php');
+include_once(dirname(__FILE__).'/Import/ZdechovNET.php');
 
 function CategoryItemCompare($Item1, $Item2)

trunk/Modules/News/NewsSource.php

@@ -75 +75 @@
       $Method = $DbRow['Method'];
       if ($Method == 'vismo') $Source = new NewsSourceVismo();
+      else if ($Method == 'zdechovnet') $Source = new NewsSourceZdechovNET();
       else {
         $Output .= 'Unsupported parse method: '.$Method.'<br/>';