From deb0c321c6e4e393774669a2096b71aae8668eb4 Mon Sep 17 00:00:00 2001
From: Ondrej Brablc <ondrej@brablc.com>
Date: Fri, 2 Feb 2018 23:52:15 +0100
Subject: [PATCH] Fix email address verification

---
 .htaccess         | 17 +++++++++++++++++
 inc/token.inc.php |  2 +-
 index.php         |  8 ++++++++
 integrator.php    |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index c96232d..ab395f6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,17 @@
+Redirect permanent /favicon.ico http://my.sitebar.org/skins/Modern/root_transparent.png
+RedirectMatch /ssl(.*) https://secure.teamforge.net/sitebar.org/my$1
+
+SetEnvIf User-Agent "^Wget\/1\.9\.1" badUA1
+SetEnvIf User-Agent "Google Desktop" badUA2
+Order Allow,Deny
+Allow from all
+Deny from env=badUA1
+Deny from env=badUA2
+
+Deny from 182.68.0.0/16
+Deny from 122.160.41.185
+#Deny from All
+
 <ifmodule mod_rewrite.c>
 	RewriteEngine On
 	RewriteRule ^user/(\w+)/(\w+)/(\w+) index.php?user=$1&w=$2&root=$3 [L,QSA]
@@ -11,3 +25,6 @@
 	RewriteRule ^news/(\w+)             news.php?root=$1 [L,QSA]
 	RewriteRule ^root/(\w+)             index.php?root=$1 [L,QSA]
 </ifmodule>
+
+Redirect permanent /favicon.ico http://my.sitebar.org/skins/Modern/root_transparent.png
+RedirectMatch /ssl(.*) https://secure.teamforge.net/sitebar.org/my$1
diff --git a/inc/token.inc.php b/inc/token.inc.php
index 29129e8..de00c8e 100644
--- a/inc/token.inc.php
+++ b/inc/token.inc.php
@@ -36,7 +36,7 @@ function __construct()
         $this->um =& SB_UserManager::staticInstance();
     }
 
-    function & staticInstance()
+    static function & staticInstance()
     {
         static $token;
 
diff --git a/index.php b/index.php
index b8acf86..da9fe5a 100644
--- a/index.php
+++ b/index.php
@@ -60,6 +60,14 @@
     $writer = 'dir';
 }
 
+// Live bookmarks
+if ($writer == 'rss' &&  SB_reqVal('sd') == '0' && !isset($_SERVER['HTTPS']))
+{
+    header("Content-Type=application/xml; charset=utf-8");
+    readfile('premium.rss');
+    exit;
+}
+
 if ($writer && !strstr($writer,'.'))
 {
     $writerFile = './inc/writers/'.$writer.'.inc.php';
diff --git a/integrator.php b/integrator.php
index f43ff86..1c96bdd 100644
--- a/integrator.php
+++ b/integrator.php
@@ -109,7 +109,7 @@
         'platforms'=>'9.0/All',
         'usage' => '',
         'exclude'  =>array(),
-        'extra'  =>array('sitebar_client','sitebar','sidebar','livebookmarks','search_engine','iframe','google'),
+        'extra'  =>array('sitebar_client','sitebar','hotlist','livebookmarks','search_engine','iframe','google'),
     ),
     'konqueror' => array
     (