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

View file

@ -112,7 +112,7 @@ function privacy_image_cache_ping_xmlize_hook(&$a, &$o) {
* @param App $a * @param App $a
* @param null|object $b * @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'); $cachetime = get_config('privacy_image_cache','cache_time');
if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_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 App $a
* @param null|object $o * @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'); check_form_security_token_redirectOnErr('/admin/plugins/privacy_image_cache', 'picsave');
if (isset($_REQUEST['save'])) { if (isset($_REQUEST['save'])) {

Binary file not shown.

View file

@ -106,7 +106,7 @@ function public_server_cron($a,$b) {
$flagposts = get_config('public_server','flagposts'); $flagposts = get_config('public_server','flagposts');
$flagpostsexpire = get_config('public_server','flagpostsexpire'); $flagpostsexpire = get_config('public_server','flagpostsexpire');
if ($flagposts && $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)) { if(count($r)) {
foreach($r as $rr) foreach($r as $rr)
q("update user set expire = %d where uid = %d limit 1", q("update user set expire = %d where uid = %d limit 1",

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 748 B

View file

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