Merge pull request #38 from beardy-unixer/master

Readme updates/Adult Smiley rename/small bug fix
pull/39/merge
friendica 2012-04-04 15:37:26 -07:00
commit c8bace61cf
14 changed files with 80 additions and 101 deletions

View File

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

View File

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

View File

@ -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. Simply replace addon/communityhome/communityhome.php with this version then enable community home in your admin panel as usual.
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.

View File

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

View File

@ -12,16 +12,7 @@ About
In the notes and postal fields you can use HTML tags for formatting. In the notes and postal fields you can use HTML tags for formatting.
Configuration: Configuration:
For configuration you can set the following variables in the .htconfig file Simply fill in the fields in the impressium settings page in the plugins area
* $a->config['impressum']['owner'] this is the Name of the Operator of your admin panel.
* $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

View File

@ -16,15 +16,12 @@ Support the OpenStreetMap community and share the load.
___ Configuration ___ ___ Configuration ___
Open the .htconfig.php file and add "openstreetmap" to the list of activated Activate the plugin from your admin panel.
addons.
$a->config['system']['addon'] = "openstreetmap, ..."
You have to add two configuration variables for the addon: You can now add a Tile Server and default zoom level in the plugin settings
$a->config['openstreetmap']['tmsserver'] = 'http://www.openstreetmap.org/'; page of your admin panel.
$a->config['openstreetmap']['zoom'] = '18';
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 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. zoom level available.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

View File

@ -13,7 +13,7 @@ function smiley_pack_install() {
register_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies'); 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'); unregister_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
} }

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 648 B

After

Width:  |  Height:  |  Size: 648 B

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 696 B

View File

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

View File

@ -50,14 +50,9 @@ __ Global Configuration __
If you enabled an administrator account, please use the admin panel to cofigure If you enabled an administrator account, please use the admin panel to cofigure
the Twitter relay. the Twitter relay.
To activate this addon add @twitter@ to the list of active addons in your Activate the plugin from the plugins section of your admin panel. When you have
.htconfig.php file done so, add your consumer key and consumer secret in the settings section of the
$a->config['system']['addon'] = "twitter, ..." plugin page.
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';
When this is done your user can now configure their Twitter connection at When this is done your user can now configure their Twitter connection at
"Settings -> Plugin Settings" and enable the forwarding of their *public* "Settings -> Plugin Settings" and enable the forwarding of their *public*