keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/friendika/friendika

Browse source
This commit is contained in:
root 2011-01-06 08:37:44 +01:00
commit 05708c9a8d
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
addon/README
View file

@ -82,10 +82,13 @@ Current hooks:
'settings_form' - called when generating the HTML for the user Settings page 'settings_form' - called when generating the HTML for the user Settings page
$b is the (string) HTML of the settings page before the final '</form>' tag. $b is the (string) HTML of the settings page before the final '</form>' tag.
'settings_post' - called when the Settings pages are submitted.
$b is the $_POST array
'plugin_settings' - called when generating the HTML for the addon settings page 'plugin_settings' - called when generating the HTML for the addon settings page
$b is the (string) HTML of the addon settings page before the final '</form>' tag. $b is the (string) HTML of the addon settings page before the final '</form>' tag.
'settings_post' - called when the Settings and Addon Settings pages are submitted. 'plugin_settings_post' - called when the Addon Settings pages are submitted.
$b is the $_POST array $b is the $_POST array
'profile_advanced' - called when the HTML is generated for the 'Advanced profile', 'profile_advanced' - called when the HTML is generated for the 'Advanced profile',

4
addon/randplace/randplace.php
View file

@ -43,7 +43,7 @@ function randplace_install() {
*/ */
register_hook('plugin_settings', 'addon/randplace/randplace.php', 'randplace_settings'); register_hook('plugin_settings', 'addon/randplace/randplace.php', 'randplace_settings');
register_hook('settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); register_hook('plugin_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
logger("installed randplace"); logger("installed randplace");
} }
@ -61,7 +61,7 @@ function randplace_uninstall() {
unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
unregister_hook('plugin_settings', 'addon/randplace/randplace.php', 'randplace_settings'); unregister_hook('plugin_settings', 'addon/randplace/randplace.php', 'randplace_settings');
unregister_hook('settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); unregister_hook('plugin_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
logger("removed randplace"); logger("removed randplace");

13
mod/settings.php
View file

@ -15,15 +15,18 @@ function settings_post(&$a) {
return; return;
} }
call_hooks('settings_post', $_POST);
if(($a->argc > 1) && ($a->argv[1] == 'addon'))
return;
if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) { if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return; return;
} }
if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
call_hooks('plugin_settings_post', $_POST);
return;
}
call_hooks('settings_post', $_POST);
if((x($_POST,'npassword')) || (x($_POST,'confirm'))) { if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
$newpass = $_POST['npassword']; $newpass = $_POST['npassword'];