aboutsummaryrefslogtreecommitdiffstats
path: root/addon/twitter
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-06-19 15:43:10 +0200
committerfabrixxm <fabrix.xm@gmail.com>2011-06-19 15:43:10 +0200
commit001982cac0c343f6405fa4191292e3f8efbd4df3 (patch)
tree5a8ca8b637ad654cae2d9b930e6730ef4ee3ff6f /addon/twitter
parentb650183cd4b82325dcaf74a42386882ef1802750 (diff)
downloadvolse-hubzilla-001982cac0c343f6405fa4191292e3f8efbd4df3.tar.gz
volse-hubzilla-001982cac0c343f6405fa4191292e3f8efbd4df3.tar.bz2
volse-hubzilla-001982cac0c343f6405fa4191292e3f8efbd4df3.zip
Change logic in admin.php to load plugin settings form. Add statusnet settings form.
Diffstat (limited to 'addon/twitter')
-rw-r--r--addon/twitter/twitter.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 3141cf0c9..aeb9cc937 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -47,7 +47,6 @@ function twitter_install() {
register_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
register_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
register_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
- register_hook('plugin_admin', 'addon/twitter/twitter.php', 'plugin_admin');
logger("installed twitter");
}
@@ -57,7 +56,6 @@ function twitter_uninstall() {
unregister_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
- unregister_hook('plugin_admin', 'addon/twitter/twitter.php', 'plugin_admin');
}
function twitter_jot_nets(&$a,&$b) {
@@ -242,14 +240,15 @@ function twitter_post_hook(&$a,&$b) {
}
}
}
-function plugin_admin_post(&$a){
+
+function twitter_plugin_admin_post(&$a){
$consumerkey = ((x($_POST,'consumerkey')) ? notags(trim($_POST['consumerkey'])) : '');
$consumersecret = ((x($_POST,'consumersecret')) ? notags(trim($_POST['consumersecret'])): '');
set_config('twitter','consumerkey',$consumerkey);
set_config('twitter','consumersecret',$consumersecret);
info( t('Settings updated.'). EOL );
}
-function plugin_admin(&$a, &$o){
+function twitter_plugin_admin(&$a, &$o){
$t = file_get_contents( dirname(__file__). "/admin.tpl" );
$o = replace_macros($t, array(
'$submit' => t('Submit'),