cherry pick pull request #544

This commit is contained in:
friendica 2014-07-24 19:07:04 -07:00
parent e7d401f387
commit 1a6973a670
6 changed files with 15 additions and 68 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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
;;
*)

View file

@ -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>

View file

@ -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}}" />