From 6f6a593984a33221b6ba822faff8ff56b31beb4c Mon Sep 17 00:00:00 2001
From: Hannes Mannerheim <h@nnesmannerhe.im>
Date: Thu, 11 Feb 2016 14:30:20 +0100
Subject: [PATCH] fixes

---
 classes/PublicAndExternalNoticeStream.php |  9 +++++++--
 doc/en/terms.html                         |  4 ++--
 js/dom-functions.js                       | 24 +++++++++++------------
 js/qvitter.js                             | 13 ++++++++----
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/classes/PublicAndExternalNoticeStream.php b/classes/PublicAndExternalNoticeStream.php
index 3e58964..5e85aff 100644
--- a/classes/PublicAndExternalNoticeStream.php
+++ b/classes/PublicAndExternalNoticeStream.php
@@ -71,8 +71,13 @@ class RawPublicAndExternalNoticeStream extends NoticeStream
 		$notice->whereAdd('is_local !='. Notice::GATEWAY);
 		$notice->whereAdd('repeat_of IS NULL');
 
-        Notice::addWhereSinceId($notice, $since_id);
-        Notice::addWhereMaxId($notice, $max_id);
+        if(!empty($max_id) && is_numeric($max_id)) {
+            $notice->whereAdd('id < '.$max_id);
+        }
+
+        if(!empty($since_id) && is_numeric($since_id)) {
+            $notice->whereAdd('id > '.$since_id);
+        }
 
         $ids = array();
 
diff --git a/doc/en/terms.html b/doc/en/terms.html
index 3a32f4e..52599ea 100644
--- a/doc/en/terms.html
+++ b/doc/en/terms.html
@@ -5,8 +5,8 @@ direction this instance is going, you are free to move to another instance or st
 You will still be able to follow and be followed (and blocked) by users on this instance.</p>
 
 <p>In constrast to the top-down authority of commercial social media, this creates a kind
-of flat power structure. We are enabled to protect eachother from harassment and opression,
-but without censorship.</p>
+of flat power structure. We are enabled to protect eachother from harassment and oppression,
+but without centralized censorship.</p>
 
 <p>On this instance, users who harass others will be removed. We also take a strong stance
 against e.g. racism, sexism, ableism, homo- and transphobia. Such expressions make the
diff --git a/js/dom-functions.js b/js/dom-functions.js
index d7f2cbb..156344f 100644
--- a/js/dom-functions.js
+++ b/js/dom-functions.js
@@ -361,21 +361,19 @@ function buildProfileCard(data) {
 
 	var followButton = '';
 
-	// only add follow button if this is a local user
-	if(data.is_local == true) {
-		if(typeof window.loggedIn.screen_name != 'undefined' && window.loggedIn.id != data.id) {
-			followButton = buildFollowBlockbutton(data);
-			}
+	// follow from external instance if logged out and the user is local
+	if(window.loggedIn === false && data.is_local == true) {
+		followButton = '<div class="user-actions"><button type="button" class="external-follow-button"><span class="button-text follow-text"><i class="follow"></i>' + window.sL.userExternalFollow + '</span></button></div>';
+		}
 
-		// follow from external instance if logged out
-		if(typeof window.loggedIn.screen_name == 'undefined') {
-			followButton = '<div class="user-actions"><button type="button" class="external-follow-button"><span class="button-text follow-text"><i class="follow"></i>' + window.sL.userExternalFollow + '</span></button></div>';
-			}
+	// edit profile button if it's me
+	else if(window.loggedIn !== false && window.loggedIn.id == data.id) {
+		followButton = '<div class="user-actions"><button type="button" class="edit-profile-button"><span class="button-text edit-profile-text">' + window.sL.editMyProfile + '</span></button></div>';
+		}
 
-		// edit profile button if me
-		if(typeof window.loggedIn.screen_name != 'undefined' && window.loggedIn.id == data.id) {
-			followButton = '<div class="user-actions"><button type="button" class="edit-profile-button"><span class="button-text edit-profile-text">' + window.sL.editMyProfile + '</span></button></div>';
-			}
+	// follow button for logged in users
+	else if(window.loggedIn !== false) {
+		followButton = buildFollowBlockbutton(data);
 		}
 
 	// is webpage empty?
diff --git a/js/qvitter.js b/js/qvitter.js
index 396ebd0..e37e59f 100644
--- a/js/qvitter.js
+++ b/js/qvitter.js
@@ -1101,11 +1101,16 @@ $('#faq-link').click(function(){
    ·
    · · · · · · · · · · · · · */
 
-$('#tou-link').click(function(){
+$('#tou-link,.tou-link').click(function(){
 	popUpAction('popup-terms', window.sL.showTerms,'<div id="terms-container"></div>',false);
-	getDoc('terms',function(termsHtml){
-		$('#terms-container').html(termsHtml);
-		});
+	if(window.customTermsOfUse) {
+		$('#terms-container').html(window.customTermsOfUse);
+		}
+	else {
+		getDoc('terms',function(termsHtml){
+			$('#terms-container').html(termsHtml);
+			});
+		}
 	});