Changeset 908 for trunk

Timestamp:

May 1, 2021, 10:01:34 AM (4 years ago)

Author:

chronos

Message:

• Modified: http links replaced by https.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (1 diff)
• Common/Form/Types/GPS.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (1 diff)
• Modules/Log/Log.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/News/News.php (modified) (3 diffs)
• Modules/News/NewsPage.php (modified) (3 diffs)
• Modules/Notify/Notify.php (modified) (2 diffs)
• Modules/TimeMeasure/Measurement/MeasureClient.php (modified) (1 diff)
• Modules/User/UserModel.php (modified) (2 diffs)
• Readme.txt (modified) (2 diffs)

trunk/Application/UpdateTrace.php

@@ -1684 +1684 @@
 
   $Manager->Execute("INSERT INTO `OS` (`Id`, `Name`, `Subject`, `Web`) VALUES
-  (3, 'Ubuntu', NULL, 'http://www.ubuntu.com/'),
+  (3, 'Ubuntu', NULL, 'https://www.ubuntu.com/'),
   (4, 'Fedora', NULL, 'https://getfedora.org/'),
   (5, 'OpenSUSE', NULL, 'https://www.opensuse.org/'),

trunk/Common/Form/Types/GPS.php

@@ -13 +13 @@
       $Longitude = $this->Explode($DbRow['Longitude']);
       $Latitude = $this->Explode($DbRow['Latitude']);
-      $Output = '<a href="http://www.mapy.cz/?st=search&fr=loc:'.$DbRow['Latitude'].' '.$DbRow['Longitude'].'">'.$Latitude[0].'°'.$Latitude[1]."'".$Latitude[2].'" '.$Longitude[0].'°'.$Longitude[1]."'".$Longitude[2].'"</a>';
+      $Output = '<a href="https://www.mapy.cz/?st=search&fr=loc:'.$DbRow['Latitude'].' '.$DbRow['Longitude'].'">'.$Latitude[0].'°'.$Latitude[1]."'".$Latitude[2].'" '.$Longitude[0].'°'.$Longitude[1]."'".$Longitude[2].'"</a>';
     }
     return $Output;

trunk/Modules/Customer/Customer.php

@@ -276 +276 @@
         if ($Contract['File'] > 0) $Output .= 'Smlouva: <a href="'.$this->System->Link('/file?h='.$Contract['FileHash']).'">'.$Contract['BillCodeText'].'</a><br/>';
           else $Output .= 'Smlouva: '.$Contract['BillCodeText'].'<br/>';
-        $Output .= 'Všeobecné smluvní podmínky: <a href="http://www.zdechov.net/docs/V%C5%A1eobecn%C3%A9%20smluvn%C3%AD%20podm%C3%ADnky.pdf">PDF</a><br/>';
+        $Output .= 'Všeobecné smluvní podmínky: <a href="https://www.zdechov.net/docs/V%C5%A1eobecn%C3%A9%20smluvn%C3%AD%20podm%C3%ADnky.pdf">PDF</a><br/>';
       }
     }

trunk/Modules/Finance/Manage.php

@@ -408 +408 @@
       $Content .= '</table><br />'."\n".
       'Pro aktuální informace, prohlížení elektronických dokladů a možnost změny údajů se prosím přihlaste na stránkách '.
-      '<a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'">http://'.
+      '<a href="https://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'">https://'.
       $Config['Web']['Host'].$Config['Web']['RootFolder'].'</a>.<br /><br />'."\n";
 

trunk/Modules/Log/Log.php

@@ -71 +71 @@
       (
         'Title' => $Line['Module'].' '.$Line['Operation'].' ('.$Line['UserName'].', '.$Line['IPAddress'].')',
-        'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/log.php'),
+        'Link' => 'https://'.$this->System->Config['Web']['Host'].$this->System->Link('/log.php'),
         'Description' => $Line['Module'].' '.$Line['Operation'].': '.$Line['Value'].' ('.$Line['UserName'].
           ', '.$Line['IPAddress'].', '.HumanDate($Line['Time']).')',
@@ -80 +80 @@
     $RSS = new RSS();
     $RSS->Title = $this->System->Config['Web']['Title'].' - Záznamy';
-    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/';
+    $RSS->Link = 'https://'.$this->System->Config['Web']['Host'].'/';
     $RSS->Description = 'Aktuality '.$this->System->Config['Web']['Description'];
     $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];

trunk/Modules/Network/Network.php

@@ -25 +25 @@
     '<a href="?section=obsazeni_wifi_kanalu&amp;range=bc">Pásmo 5 GHz dolní (b, c)</a> '.
     '<a href="?section=obsazeni_wifi_kanalu&amp;range=d">Pásmo 5 GHz horní (d)</a> '.
-    '<a href="http://www.ctu.cz/1/download/Opatreni%20obecne%20povahy/VO_R_12_08_2005_34.pdf">VO_R_12_08_2005_34</a><br/>'.
+    '<a href="https://www.ctu.cz/1/download/Opatreni%20obecne%20povahy/VO_R_12_08_2005_34.pdf">VO_R_12_08_2005_34</a><br/>'.
     '<strong>Seznam známých AP a obsazení kmitočtových pásem:</strong></div>'.
     '<table class="WideTable">'.

trunk/Modules/News/News.php

@@ -240 +240 @@
   }
 
-  function ModifyContent(string $Content): string
+  function ModifyContentPrefix(string $Content, string $Prefix): string
   {
     $Result = '';
@@ -246 +246 @@
     // Make HTML link from URL
     $I = 0;
-    while (strpos($Content, 'http://') !== false)
-    {
-      $I = strpos($Content, 'http://');
+    while (strpos($Content, $Prefix) !== false)
+    {
+      $I = strpos($Content, $Prefix);
       if (($I > 0) and ($Content[$I - 1] != '"'))
       {
@@ -266 +266 @@
     $Result .= $Content;
     return $Result;
+  }
+
+  function ModifyContent(string $Content): string
+  {
+    return $this->ModifyContentPrefix($this->ModifyContentPrefix($Content, 'http://'), 'https://');
   }
 

trunk/Modules/News/NewsPage.php

@@ -350 +350 @@
     } else
     {
-      $Output = 'Vytvořte si vlastní RSS kanál, díky kterému budete moci automaticky sledovat novinky pomocí vaší RSS čtečky. Informace o technologii RSS a programech pro čtení kanálů najdete např. <a href="http://www.lupa.cz/clanky/prehled-rss-ctecek/">zde</a><br />'.
+      $Output = 'Vytvořte si vlastní RSS kanál, díky kterému budete moci automaticky sledovat novinky pomocí vaší RSS čtečky. '.
+        'Informace o technologii RSS a programech pro čtení kanálů najdete např. <a href="https://www.lupa.cz/clanky/prehled-rss-ctecek/">zde</a><br />'.
       '<br />Kategorie:<br />';
       $Output .= '<form action="?build=1" method="post">';
@@ -458 +459 @@
       $Items[] = array(
         'Title' => $Categories[$Row['Category']].' - '.$Row['Title'],
-        'Link' => 'http://'.$this->System->Config['Web']['Host'].'/aktuality/?category='.$Row['Category'],
+        'Link' => 'https://'.$this->System->Config['Web']['Host'].'/aktuality/?category='.$Row['Category'],
         'Description' => $Row['Content'].' ('.$Author.')'.$EnclosuresText,
         'Time' => $Row['UnixTime'],
@@ -466 +467 @@
     $RSS = new RSS();
     $RSS->Title = $this->System->Config['Web']['Title'].' - Aktuality';
-    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/';
+    $RSS->Link = 'https://'.$this->System->Config['Web']['Host'].'/';
     $RSS->Description = 'Aktuality '.$this->System->Config['Web']['Description'];
     $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];

trunk/Modules/Notify/Notify.php

@@ -158 +158 @@
       (
         'Title' => $Line['Title'],
-        'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/Notify.php'),
+        'Link' => 'https://'.$this->System->Config['Web']['Host'].$this->System->Link('/Notify.php'),
         'Description' => $Line['Content'],
         'Time' => $Line['Time'],
@@ -166 +166 @@
     $RSS = new RSS();
     $RSS->Title = $this->System->Config['Web']['Title'].' - Záznamy upozornění';
-    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/';
+    $RSS->Link = 'https://'.$this->System->Config['Web']['Host'].'/';
     $RSS->Description = 'Záznam upozornění '.$this->System->Config['Web']['Description'];
     $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];

trunk/Modules/TimeMeasure/Measurement/MeasureClient.php

@@ -22 +22 @@
           if ($MeasureClient['Parameter'] != '') $Value = $Measure->$MeasureMethod['Method']($MeasureClient['Parameter']);
             else $Value = $MeasureClass->$MeasureMethod['Method']();
-          echo(file_get_contents('http://'.$MeasureClient['Host'].$MeasureClient['Path'].'/?M=Add&MeasureId='.$MeasureClient['MeasureId'].'&Value='.addslashes($Value)));
+          echo(file_get_contents('https://'.$MeasureClient['Host'].$MeasureClient['Path'].'/?M=Add&MeasureId='.$MeasureClient['MeasureId'].'&Value='.addslashes($Value)));
         } else echo('Metoda '.$MeasureMethod['Method'].' neexistuje.');
       } else echo('Třída '.$MeasureMethod['MeasureClass'].' neexistuje.');

trunk/Modules/User/UserModel.php

@@ -179 +179 @@
 
             // Send activation mail to user email
-            $ServerURL = 'http://'.$this->System->Config['Web']['Host'].$this->System->Config['Web']['RootFolder'];
+            $ServerURL = 'https://'.$this->System->Config['Web']['Host'].$this->System->Config['Web']['RootFolder'];
             $Mail = new Mail();
             $Mail->Subject = 'Registrace nového účtu';
@@ -407 +407 @@
       $NewPassword = substr(sha1(strtoupper($Row['Login'])), 0, 7);
 
-      $ServerURL = 'http://'.$this->System->Config['Web']['Host'].$this->System->Config['Web']['RootFolder'];
+      $ServerURL = 'https://'.$this->System->Config['Web']['Host'].$this->System->Config['Web']['RootFolder'];
       $Mail = new Mail();
       $Mail->Subject = 'Obnova hesla';

trunk/Readme.txt

@@ -15 +15 @@
   Do složky Modules/NetworkConfigRouterOS/Generators zkopírovat soubory id_dsa a id_dsa.pub.
   Soubory lze vygenerovat pomocí příkazu ssh-keygen -t dsa.
-  Další informace: http://wiki.mikrotik.com/wiki/Use_SSH_to_execute_commands_(DSA_key_login)
+  Další informace: https://wiki.mikrotik.com/wiki/Use_SSH_to_execute_commands_(DSA_key_login)
 
 
@@ -29 +29 @@
   uploads - vlastníka nastavit na apache
 
-  
+
 5) Požadované balíky
   htmldoc - Pro generování PDF z HTML
   fping - fast ping for checking status of network devices
-  
+
   Ubuntu: apt-get install htmldoc php7-mbstring fping