friendica/friendica-addons
8
3
Fork 14
Code Issues 3 Pull requests 1 Releases 16 Wiki Activity

Merge https://github.com/friendica/friendica-addons into apull

Browse source
This commit is contained in:
friendica 2012-05-21 16:42:17 -07:00
commit 7a4674bc69
7 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
privacy_image_cache/privacy_image_cache.php
View file

@ -112,7 +112,7 @@ function privacy_image_cache_ping_xmlize_hook(&$a, &$o) {
* @param App $a
* @param null|object $b
*/
function privacy_image_cache_cron(&$a, &$b) {
function privacy_image_cache_cron(&$a = null, &$b = null) {
$cachetime = get_config('privacy_image_cache','cache_time');
if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME;
@ -161,7 +161,7 @@ function privacy_image_cache_plugin_admin(&$a, &$o){
* @param App $a
* @param null|object $o
*/
function privacy_image_cache_plugin_admin_post(&$a, &$o){
function privacy_image_cache_plugin_admin_post(&$a = null, &$o = null){
check_form_security_token_redirectOnErr('/admin/plugins/privacy_image_cache', 'picsave');
if (isset($_REQUEST['save'])) {

BIN
public_server.tgz
View file

Binary file not shown.

2
public_server/public_server.php
View file

@ -106,7 +106,7 @@ function public_server_cron($a,$b) {
$flagposts = get_config('public_server','flagposts');
$flagpostsexpire = get_config('public_server','flagpostsexpire');
if ($flagposts && $flagpostsexpire) {
$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and 'page-flags' = 0",intval(flagposts));
$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and `page-flags` = 0",intval($flagposts));
if(count($r)) {
foreach($r as $rr)
q("update user set expire = %d where uid = %d limit 1",

BIN
smiley_pack.tgz
View file

Binary file not shown.

BIN
smiley_pack/icons/fight/alpha.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 664 B

BIN
smiley_pack/icons/sad/sigh.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 748 B

8
smiley_pack/smiley_pack.php
View file

@ -2,7 +2,7 @@
/*
* Name: Smiley Pack
* Description: Pack of smileys that make master too AOLish.
* Version: 1.0
* Version: 1.01
* Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
* All smileys from sites offering them as Public Domain
*
@ -204,6 +204,9 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':prisoner';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
$b['texts'][] = ':sigh';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh' . '" />';
#Smoking - only one smiley in here, maybe it needs moving elsewhere?
$b['texts'][] = ':smoking';
@ -295,6 +298,9 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':alienfight';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
$b['texts'][] = ':alpha';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
$b['texts'][] = ':army';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';