Twitter: added App name config to admin panel

diff --git a/twitter/README b/twitter/README
index ff08976c79613d98828d078c0b603c1c1f25158b..8041f317be8582ffa39a8adb8f1ae41c2bbd99eb 100755 (executable)
--- a/twitter/README
+++ b/twitter/README
@@ -3,17 +3,14 @@ By Tobias Diekershoff
    http://diekershoff.homeunix.net/friendika/profile/tobias
    tobias.diekershoff(at)gmx.net
 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!   This addon is currently under development. If you have any problem     !!
-!!   with it, please contact the Author.                                    !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 With this addon to Friendica you can give your user the possibility to post
 their *public* messages to Twitter. The messages will be strapped their rich
 context and shortened to 140 characters length if necessary. If shortening of
 the message was performed a link will be added to the Tweet pointing to the
 original message on your server.
 
+The addon can also mirror a users Tweets into the ~friendica wall.
+
 There is a similar addon for forwarding public messages to
 "StatusNet":http://status.net [[StatusNet Plugin]].
 

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 88cf38588e3532a707180639e83b31095cadd870..7bf01eff8f197346d4e72d382c092b63531dccaa 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -543,8 +543,10 @@ function twitter_post_hook(&$a,&$b) {
 function twitter_plugin_admin_post(&$a){
        $consumerkey    =       ((x($_POST,'consumerkey'))              ? notags(trim($_POST['consumerkey']))   : '');
        $consumersecret =       ((x($_POST,'consumersecret'))   ? notags(trim($_POST['consumersecret'])): '');
+        $applicationname = ((x($_POST, 'application-name')) ? notags(trin($_POST['applicationname'])):'');
        set_config('twitter','consumerkey',$consumerkey);
        set_config('twitter','consumersecret',$consumersecret);
+       set_config('twitter','application_name',$applicationname);
        info( t('Settings updated.'). EOL );
 }
 function twitter_plugin_admin(&$a, &$o){
@@ -554,7 +556,8 @@ function twitter_plugin_admin(&$a, &$o){
                '$submit' => t('Submit'),
                                                                // name, label, value, help, [extra values]
                '$consumerkey' => array('consumerkey', t('Consumer key'),  get_config('twitter', 'consumerkey' ), ''),
-               '$consumersecret' => array('consumersecret', t('Consumer secret'),  get_config('twitter', 'consumersecret' ), '')
+                '$consumersecret' => array('consumersecret', t('Consumer secret'),  get_config('twitter', 'consumersecret' ), ''),
+                '$applicationname' => array('applicationname', t('Name of the Twitter Application'), get_config('twitter','applicationname'),t('set this to avoid mirroring postings from ~friendica back to ~friendica'))
        ));
 }
 

diff --git a/twitter/view/admin.tpl b/twitter/view/admin.tpl
index a83eb07a4d31c28a200ccc6eb55e40be65f8f443..b89f51b6c0cd531f54aefb5fa6f13e4d47fae3dd 100644 (file)
--- a/twitter/view/admin.tpl
+++ b/twitter/view/admin.tpl
@@ -1,3 +1,4 @@
 {{ inc field_input.tpl with $field=$consumerkey }}{{ endinc }}
 {{ inc field_input.tpl with $field=$consumersecret }}{{ endinc }}
+{{ inc field_input.tpl with $field=$applicationname }}{{ endinc }}
 <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/twitter/view/smarty3/admin.tpl b/twitter/view/smarty3/admin.tpl
index 9efcb06560d2dc987f0c07c3b07b2e63eeaec3c7..554ed5a0f0e076fd3498e3d1f08f6f9504a2de89 100644 (file)
--- a/twitter/view/smarty3/admin.tpl
+++ b/twitter/view/smarty3/admin.tpl
@@ -1,3 +1,4 @@
 {{include file="field_input.tpl" field=$consumerkey}}
 {{include file="field_input.tpl" field=$consumersecret}}
+{{include file="field_input.tpl" field=$applicationname}}
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>