From 1a6973a670b7137353708e838d9076be3e9b93bf Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 24 Jul 2014 19:07:04 -0700
Subject: cherry pick pull request #544

---
 .htaccess              | 14 +-------------
 error_log              |  1 -
 robots.txt             | 35 -----------------------------------
 util/shredder/shredder | 24 ++++++++++++------------
 view/tpl/hdr.tpl       |  5 +----
 view/tpl/head.tpl      |  4 +---
 6 files changed, 15 insertions(+), 68 deletions(-)
 delete mode 100644 error_log
 delete mode 100644 robots.txt

diff --git a/.htaccess b/.htaccess
index acfe4d346..39fd89e04 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,7 @@
 Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
-SSLCipherSuite HIGH:AES256-SHA:AES128-SHA:RC4:!aNULL:!eNULL:!EDH
+#SSLCipherSuite HIGH:AES256-SHA:AES128-SHA:RC4:!aNULL:!eNULL:!EDH
 
 # don't allow any web access to logfiles, even after rotation/compression
 <FilesMatch "\.(out|log|gz)$">
@@ -25,15 +25,3 @@ Deny from all
 
 </IfModule>
 
-# Set Apache compression
-# compress text, html, javascript, css, xml:
-AddOutputFilterByType DEFLATE text/plain
-AddOutputFilterByType DEFLATE text/html
-AddOutputFilterByType DEFLATE text/xml
-AddOutputFilterByType DEFLATE text/css
-AddOutputFilterByType DEFLATE application/xml
-AddOutputFilterByType DEFLATE application/xhtml+xml
-AddOutputFilterByType DEFLATE application/rss+xml
-AddOutputFilterByType DEFLATE application/javascript
-AddOutputFilterByType DEFLATE application/x-javascript
-
diff --git a/error_log b/error_log
deleted file mode 100644
index d6ae239a0..000000000
--- a/error_log
+++ /dev/null
@@ -1 +0,0 @@
-[24-Jul-2014 22:00:18 UTC] PHP Warning:  file_get_contents(version.inc): failed to open stream: No such file or directory in /home/mycocham/public_html/red/boot.php on line 47
diff --git a/robots.txt b/robots.txt
deleted file mode 100644
index 632a2fa81..000000000
--- a/robots.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# If the Joomla site is installed within a folder such as at
-# e.g. www.example.com/joomla/ the robots.txt file MUST be
-# moved to the site root at e.g. www.example.com/robots.txt
-# AND the joomla folder name MUST be prefixed to the disallowed
-# path, e.g. the Disallow rule for the /administrator/ folder
-# MUST be changed to read Disallow: /joomla/administrator/
-#
-# For more information about the robots.txt standard, see:
-# http://www.robotstxt.org/orig.html
-#
-# For syntax checking, see:
-# http://tool.motoricerca.info/robots-checker.phtml
-
-User-agent: *
-Disallow: /.git/
-Disallow: /store/
-Disallow: /addon/
-Disallow: /include/
-Disallow: /view/
-Disallow: /vendor/
-Disallow: /util/
-Disallow: /tests/
-Disallow: /mod/
-Disallow: /library/
-Disallow: /install/
-Disallow: /images/
-Disallow: /doc/
-Disallow: /assets/
-Disallow: /app/
-
-#Begin Attracta SEO Tools Sitemap. Do not remove
-sitemap: http://cdn.attracta.com/sitemap/3798343.xml.gz
-#End Attracta SEO Tools Sitemap. Do not remove
-
-
diff --git a/util/shredder/shredder b/util/shredder/shredder
index 1586746e0..ac84f0541 100755
--- a/util/shredder/shredder
+++ b/util/shredder/shredder
@@ -203,18 +203,18 @@ main () {
         
 		return $FO_rval
 		;;
-#	statuses_update)
-#		[[ "$fcli_status" == "" ]] && show_statuses_update 1
-#		FO_statuses_update 'json' "$fcli_status" "$fcli_in_reply_to_status_id"
-#        JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
-#        echo "$JS_Parsed" | js "user" "name" ,
-#	    echo -n " - "
-#	    echo "$JS_Parsed" | js "created_at"
-#        echo "$JS_Parsed" | js "text"
-#	    echo ""
-#	    echo "------------------------------------------------------------------------------"
-#		return $FO_rval
-#		;;
+	statuses_update)
+		[[ "$fcli_status" == "" ]] && show_statuses_update 1
+		FO_statuses_update 'json' "$fcli_status" "$fcli_in_reply_to_status_id"
+        JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
+        echo "$JS_Parsed" | js "user" "name" ,
+	    echo -n " - "
+	    echo "$JS_Parsed" | js "created_at"
+        echo "$JS_Parsed" | js "text"
+	    echo ""
+	    echo "------------------------------------------------------------------------------"
+		return $FO_rval
+		;;
 
 	*)
 
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl
index 749646ace..fdcc4521c 100644
--- a/view/tpl/hdr.tpl
+++ b/view/tpl/hdr.tpl
@@ -1,7 +1,4 @@
-<div id="banner" class="hidden-sm hidden-xs">{{$banner}}
-<!--accept bitcoins through coinbase (https://coinbase.com/)-->
-<a class="coinbase-button" data-code="7a7dc20e073d84e7d81dcf8f5acb9a4e" data-button-style="donation_small" href="https://coinbase.com/checkouts/7a7dc20e073d84e7d81dcf8f5acb9a4e">CLICK TO DONATE</a><script src="https://coinbase.com/assets/button.js" type="text/javascript"></script>
-</div>
+<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index fb73c6de4..b90bf8b89 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,7 +1,5 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
-<META NAME="description" CONTENT="The RedMatrix is a super network created from a huge number of smaller independent and autonomous websites - which are linked together...">
-<META NAME="keywords" CONTENT="network,matrix,social,communications,social networking,content ownership,privacy and content ownership">
-<META NAME="robot" CONTENT="index,follow">
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=0" />
 <meta name="generator" content="{{$generator}}" />
 
-- 
cgit v1.2.3