Auto-redirects HTML pages to HTTPS

[platal.git] / classes / xnet.php

diff --git a/classes/xnet.php b/classes/xnet.php
index 4f76e38..58d1375 100644 (file)
--- a/classes/xnet.php
+++ b/classes/xnet.php
@@ -21,10 +21,10 @@
 
 class Xnet extends Platal
 {
-    function Xnet()
+    public function __construct()
     {
         $modules = func_get_args();
-        call_user_func_array(array(&$this, 'Platal'), $modules);
+        parent::__construct($modules);
 
         global $globals;
         if ($globals->asso()) {
@@ -38,7 +38,7 @@ class Xnet extends Platal
         }
     }
 
-    function find_nearest_key($key, &$array)
+    protected function find_nearest_key($key, array &$array)
     {
         global $globals;
         if (in_array('%grp', array_keys($array)) &&  $key == $globals->asso('diminutif')) {
@@ -47,7 +47,7 @@ class Xnet extends Platal
         return parent::find_nearest_key($key, $array);
     }
 
-    function near_hook()
+    public function near_hook()
     {
         global $globals;
         $link = str_replace('%grp', $globals->asso('diminutif'), parent::near_hook());
@@ -57,9 +57,10 @@ class Xnet extends Platal
         return null; 
     }
 
-    function find_hook()
+    protected function find_hook()
     {
         $ans = parent::find_hook();
+        $this->https = false;
         if ($ans && $this->ns) {
             $this->path    = $this->ns . substr($this->path, 5);
             $this->argv[0] = $this->ns . substr($this->argv[0], 5);
@@ -67,7 +68,7 @@ class Xnet extends Platal
         return $ans;
     }
 
-    function force_login(&$page)
+    public function force_login(&$page)
     {
         http_redirect(S::v('loginX'));
     }