Merge pull request #38 from beardy-unixer/master

Readme updates/Adult Smiley rename/small bug fix

adult_smile/adult_smile.php

@@ -1,34 +0,0 @@
-<?php
-/*
- * Name: Adult Smilies
- * Description: Smily icons that could or should not be included in core
- * Version: 1.0
- * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
- * This is a template for how to extend the "smily" code.
- * 
- */
-
-function adult_smile_install() {
-	register_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
-}
-
-function adult_smile_uninstall() {
-	unregister_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
-}
-
- 
-
-function adult_smile_smilies(&$a,&$b) {
-
-	$b['texts'][] = '(o)(o)';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
-
-	$b['texts'][] = '(.)(.)';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
-
-	$b['texts'][] = ':bong';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/bong.gif' . '" alt="' . ':bong' . '" />';
-
-
-}

communityhome/communityhome.php

@@ -35,7 +35,7 @@ function communityhome_home(&$a, &$o){
 	$aside['$login_form'] = login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
 	
 	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
+	$aside['$lastusers_title'] = t('Latest users');
 	$aside['$lastusers_items'] = array();
 	$sql_extra = "";
 	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
@@ -95,7 +95,7 @@ function communityhome_home(&$a, &$o){
 	}
 	
 	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
+	$aside['$photos_title'] = t('Latest photos');
 	$aside['$photos_items'] = array();
 	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
 				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
@@ -130,7 +130,7 @@ function communityhome_home(&$a, &$o){
 	}
 	
 	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
+	$aside['$like_title'] = t('Latest likes');
 	$aside['$like_items'] = array();
 	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
 			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 

communityhome/twillingham/README

@@ -1,7 +1,3 @@
-Thomas Willingham
+This is a variant of the community home.  Instead of displaying the community tab in the front page, we still use home.html, but we also add the latest users to the sidebar.
 
-This isn't even close to being worth a pull request, but some people might find it useful.
-
-Enable community home in your admin panel, then replace communityhome.php with this one to get a front page like mine (a normal front page, but with latest users shown in the sidebar, which looks bleak when there's nothing in it).
-
-There are more graceful ways of doing this, I used communityhome as I plan to make use of a limited stream and likes in future.
+Simply replace addon/communityhome/communityhome.php with this version then enable community home in your admin panel as usual.

facebook/README

@@ -1,34 +1,30 @@
 Installing the Friendica/Facebook connector
 
-1. register an API key for your site from developer.facebook.com
-  a. We'd be very happy if you include "Friendica" in the application name
-     to increase name recognition. The Friendica icons are also present
-     in the images directory and may be uploaded as a Facebook app icon.
-     Use images/friendica-16.jpg for the Icon and images/friendica-128.jpg for the Logo.
-  b. The url should be your site URL with a trailing slash.
-     You may use http://portal.friendika.com/privacy as the privacy policy
-     URL unless your site has different requirements, and 
-     http://portal.friendika.com as the Terms of Service URL unless
-     you have different requirements. (Friendica is a software application
-     and does not require Terms of Service, though your installation of it might).
-  c. Set the following values in your .htconfig.php file
-        $a->config['facebook']['appid'] = 'xxxxxxxxxxx';
-        $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx';
-     Replace with the settings Facebook gives you.
-  d. Navigate to Set Web->Site URL & Domain -> Website Settings.  Set Site URL 
-     to yoursubdomain.yourdomain.com.  Set Site Domain to your yourdomain.com.
-  e. Chose "Website" (the url should be your site URL with a trailing slash) in the
-     "Select how your app integrates with Facebook" section.
-2. Enable the facebook plugin by including it in .htconfig.php - e.g. 
-    $a->config['system']['addon'] = 'plugin1,plugin2,facebook';
-3. Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
-   and click 'Install Facebook Connector'.
-4. This will ask you to login to Facebook and grant permission to the 
-   plugin to do its stuff. Allow it to do so. 
-5. Optional step: If you want to use Facebook Real Time Updates (so new messages
-   and new contacts are added ~1min after they are postet / added on FB), go to
-   Settings -> plugins -> facebook and press the "Activate Real-Time Updates"-button.
-6. You're done. To turn it off visit the Plugin Settings page again and
+1. Visit https://developers.facebook.com/apps to register an app.
+    a) Click "Create a new app"
+    b) We'd be very happy if you include "Friendica" in the application name
+       to increase name recognition.  
+    c) Edit your app settings on the setup page.  The Friendica icons are present
+       in the images directory and may be uploaded as a Facebook app icon.  Use 
+       images/friendica-16.jpg for the Icon and images/Friendica-128.jpg for the logo.
+    d) In the App Display name enter the name of your app (this should default to the
+       name you chose in part a).
+    e) Enter YourDomain.com in the App Domain field and hit return.
+    f) In "Select how your app connects with Facebook select "Website" and enter the 
+       full URL to your Friendica install including HTTPS and a trailing slash.
+
+2.    Enable the Facebook plugin by clicking on the icon next to it's name on the plugin
+      page of your admin panel.
+   b) return to the Facebook plugin page in your admin panel, and fill in the App-ID
+      and Application Secret settings you got from Facebook.
+   c) Click save.
+   d) Finally, return to the Facebook settings page, and activate real-time updates.
+
+3.    To use the Facebook plugin, visit the "connector settings" area of your settings
+      page.  Click "Install Facebook Connector".  
+4.    This will ask you to login to Facebook and allow the plugin to do it's stuff.  
+      Allow it to do so.
+5.    You're done. To turn it off visit the Plugin Settings page again and
       'Remove Facebook posting'.
 
 Vidoes and embeds will not be posted if there is no other content. Links 

impressum/README

@@ -12,16 +12,7 @@ About
   In the notes and postal fields you can use HTML tags for formatting.
 
 Configuration:
-  For configuration you can set the following variables in the .htconfig file
-   * $a->config['impressum']['owner']           this is the Name of the Operator
-   * $a->config['impressum']['ownerprofile']    this is an optional Friendica account
-                                                where the above owner name will link to
-   * $a->config['impressum']['email']           a contact email address (optional)
-                                                will be displayed slightly obfuscated
-                                                as name(at)example(dot)com
-   * $a->config['impressum']['postal']          should contain a postal address where
-                                                you can be reached at (optional)
-   * $a->config['impressum']['notes']           additional informations that should
-                                                be displayed in the Impressum block
+  Simply fill in the fields in the impressium settings page in the plugins area
+  of your admin panel.
  
 

openstreetmap/README

@@ -16,15 +16,12 @@ Support the OpenStreetMap community and share the load.
 
 ___ Configuration ___
 
-Open the .htconfig.php file and add "openstreetmap" to the list of activated
-addons.
-    $a->config['system']['addon'] = "openstreetmap, ..."
+Activate the plugin from your admin panel.  
 
-You have to add two configuration variables for the addon:
-    $a->config['openstreetmap']['tmsserver'] = 'http://www.openstreetmap.org/';
-    $a->config['openstreetmap']['zoom'] = '18';
+You can now add a Tile Server and default zoom level in the plugin settings
+page of your admin panel.
 
-The *tmsserver* points to the tile server you want to use. Use the full URL,
+The Time Server URL points to the tile server you want to use. Use the full URL,
 with protocol (http/s) and trailing slash. You can configure the default zoom
-level on the map with *zoom*. 1 will show the whole world and 18 is the highest
+level on the map in the Default Zoom box.  1 will show the whole world and 18 is the highest
 zoom level available.

smiley_pack/smiley_pack.php

@@ -13,7 +13,7 @@ function smiley_pack_install() {
 	register_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
 }
 
-function smiley_pack__uninstall() {
+function smiley_pack_uninstall() {
 	unregister_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
 }
 

smilies-adult/smilies-adult.php

@@ -0,0 +1,38 @@
+<?php
+/*
+ * Name: Adult Smilies
+ * Description: Smily icons that could or should not be included in core
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * 
+ * This is a template for how to extend the "smily" code.
+ * 
+ */
+
+function adult_smile_install() {
+	register_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
+}
+
+function adult_smile_uninstall() {
+	unregister_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
+}
+
+ 
+
+function adult_smile_smilies(&$a,&$b) {
+
+	$b['texts'][] = '(o)(o)';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
+
+	$b['texts'][] = '(.)(.)';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
+
+	$b['texts'][] = ':bong';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/bong.gif' . '" alt="' . ':bong' . '" />';
+
+	$b['texts'][] = ':sperm';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/sperm.gif' . '" alt="' . ':sperm' . '" />';
+
+	$b['texts'][] = ':drunk';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/drunk.gif' . '" alt="' . ':drunk' . '" />';
+}

twitter/README

@@ -50,14 +50,9 @@ __ Global Configuration __
 If you enabled an administrator account, please use the admin panel to cofigure
 the Twitter relay.
 
-To activate this addon add @twitter@ to the list of active addons in your
-.htconfig.php file 
-    $a->config['system']['addon'] = "twitter, ..."
-Afterwards you need to add your OAuth consumer key / secret pair to it by
-adding the following two lines
-
-$a->config['twitter']['consumerkey'] = 'your consumer KEY here';
-$a->config['twitter']['consumersecret'] = 'your consumer SECRET here';
+Activate the plugin from the plugins section of your admin panel.  When you have
+done so, add your consumer key and consumer secret in the settings section of the 
+plugin page.
 
 When this is done your user can now configure their Twitter connection at
 "Settings -> Plugin Settings" and enable the forwarding of their *public*