Merge branch 'master' of github.com:friendica/friendica-addons

This commit is contained in:
Thomas Willingham 2012-05-24 17:31:14 +01:00
commit 6f37cb01a9
7 changed files with 121 additions and 2 deletions

BIN
privacy_image_cache.tgz Normal file

Binary file not shown.

View File

@ -62,7 +62,9 @@ function privacy_image_cache_init() {
*/ */
function privacy_image_cache_is_local_image($url) { function privacy_image_cache_is_local_image($url) {
if ($url[0] == '/') return true; if ($url[0] == '/') return true;
$baseurl = get_app()->get_baseurl(); // links normalised - bug #431
$baseurl = normalise_link(get_app()->get_baseurl());
$url = normalise_link($url);
return (substr($url, 0, strlen($baseurl)) == $baseurl); return (substr($url, 0, strlen($baseurl)) == $baseurl);
} }
@ -71,7 +73,8 @@ function privacy_image_cache_is_local_image($url) {
* @return string * @return string
*/ */
function privacy_image_cache_img_cb($matches) { function privacy_image_cache_img_cb($matches) {
if (privacy_image_cache_is_local_image($matches[2])) return $matches[2]; // following line changed per bug #431
if (privacy_image_cache_is_local_image($matches[2])) return $matches[1] . $matches[2] . $matches[3];
return $matches[1] . "/privacy_image_cache/?url=" . escape_tags(addslashes($matches[2])) . $matches[3]; return $matches[1] . "/privacy_image_cache/?url=" . escape_tags(addslashes($matches[2])) . $matches[3];
} }

BIN
startpage.tgz Normal file

Binary file not shown.

16
startpage/startpage.css Normal file
View File

@ -0,0 +1,16 @@
#startpage-page-label {
float: left;
width: 200px;
margin-bottom: 25px;
}
#startpage-page {
float: left;
}
#startpage-desc {
margin-bottom: 10px;
}

94
startpage/startpage.php Normal file
View File

@ -0,0 +1,94 @@
<?php
/**
* Name: Start Page
* Description: Set a preferred page to load on login from home page
* Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*
*/
function startpage_install() {
register_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
register_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings');
register_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
}
function startpage_uninstall() {
unregister_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
unregister_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings');
unregister_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
}
function startpage_home_init($a, $b) {
if(! local_user())
return;
$page = get_pconfig(local_user(),'startpage','startpage');
if(strlen($page)) {
$slash = ((strpos($page,'/') === 0) ? true : false);
if(stristr($page,'://'))
goaway($page);
goaway($a->get_baseurl() . (($slash) ? '' : '/') . $page);
}
return;
}
/**
*
* Callback from the settings post function.
* $post contains the $_POST array.
* We will make sure we've got a valid user account
* and if so set our configuration setting for this person.
*
*/
function startpage_settings_post($a,$post) {
if(! local_user())
return;
if($_POST['startpage-submit'])
set_pconfig(local_user(),'startpage','startpage',strip_tags(trim($_POST['startpage'])));
}
/**
*
* Called from the Plugin Setting form.
* Add our own settings info to the page.
*
*/
function startpage_settings(&$a,&$s) {
if(! local_user())
return;
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */
$page = get_pconfig(local_user(),'startpage','startpage');
/* Add some HTML to the existing form */
$s .= '<div class="settings-block">';
$s .= '<h3>' . t('Startpage Settings') . '</h3>';
$s .= '<div id="startpage-page-wrapper">';
$s .= '<label id="startpage-page-label" for="startpage-page">' . t('Home page to load after login - leave blank for profile wall') . '</label>';
$s .= '<input id="startpage-page" type="text" name="startpage" value="' . $page . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="startpage-desc">' . t('Examples: &quot;network&quot; or &quot;notifications/system&quot;') . '</div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="startpage-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
}

Binary file not shown.

View File

@ -15,6 +15,7 @@ function testdrive_install() {
register_hook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account'); register_hook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
register_hook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron'); register_hook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
register_hook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify'); register_hook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
register_hook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
} }
@ -24,9 +25,14 @@ function testdrive_uninstall() {
unregister_hook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account'); unregister_hook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
unregister_hook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron'); unregister_hook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
unregister_hook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify'); unregister_hook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
unregister_hook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
} }
function testdrive_globaldir_update($a,&$b) {
$b['url'] = '';
}
function testdrive_register_account($a,$b) { function testdrive_register_account($a,$b) {
$uid = $b; $uid = $b;