plugin_twitter: Tweeter hides URL shortener functionality now if URL

shortener is set to "uncompressed".
s9y · Oct 24, 2012 · 43587f7 · 43587f7
1 parent 9921f60
commit 43587f7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/serendipity_plugin_twitter/ChangeLog b/serendipity_plugin_twitter/ChangeLog
@@ -19,6 +19,7 @@ Migrate Twitter API 1 calls to 1.1. Now requires OAuth even for simple timeline
     * Check tweetbacks (search) converted to API 1.1 (optional). You need to choose an OAuth acc handling the search.
     * Already implemented OAuth function will call API 1.1 instead of API 1.0 now.
     * Sitebar plugin, PHP version, optional uses Twitter API 1.1 with OAuth now.
+    * Tweeter hides URL shortener functionality now if URL shortener is set to "uncompressed".
 
 1.43 (brockhaus)
 --------------------------

diff --git a/serendipity_plugin_twitter/UTF-8/lang_de.inc.php b/serendipity_plugin_twitter/UTF-8/lang_de.inc.php
@@ -84,6 +84,7 @@
 @define('PLUGIN_EVENT_TWITTER_TWEETER_FORM',            'Tweet eingeben:');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_CHARSLEFT',       'Zeichen übrig');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_SHORTEN',         'URL kürzen');
+@define('PLUGIN_EVENT_TWITTER_TWEETER_UPDATE',          'Update');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_STORED',          'Tweet gesichert. ');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_STOREFAIL',       'Tweet konnte nicht übertragen werden! Fehler: ');
 

diff --git a/serendipity_plugin_twitter/lang_de.inc.php b/serendipity_plugin_twitter/lang_de.inc.php
@@ -84,6 +84,7 @@
 @define('PLUGIN_EVENT_TWITTER_TWEETER_FORM',            'Tweet eingeben:');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_CHARSLEFT',       'Zeichen übrig');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_SHORTEN',         'URL kürzen');
+@define('PLUGIN_EVENT_TWITTER_TWEETER_UPDATE',          'Update');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_STORED',          'Tweet gesichert. ');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_STOREFAIL',       'Tweet konnte nicht übertragen werden! Fehler: ');
 

diff --git a/serendipity_plugin_twitter/lang_en.inc.php b/serendipity_plugin_twitter/lang_en.inc.php
@@ -84,6 +84,7 @@
 @define('PLUGIN_EVENT_TWITTER_TWEETER_FORM',            'Enter your tweet:');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_CHARSLEFT',       'chars left');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_SHORTEN',         'Shorten URL');
+@define('PLUGIN_EVENT_TWITTER_TWEETER_UPDATE',          'Update');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_STORED',          'Tweet stored ');
 @define('PLUGIN_EVENT_TWITTER_TWEETER_STOREFAIL',       'Tweet couldn\'t be stored! Twitter error: ');
 

diff --git a/serendipity_plugin_twitter/serendipity_event_twitter.php b/serendipity_plugin_twitter/serendipity_event_twitter.php
@@ -1975,6 +1975,14 @@ function display_twitter_client($tweeter_in_sidbar = false) {
             $http_length_str = str_repeat("=", $this->get_config('twitter_config_http_len'));
             $https_length_str = str_repeat("=", $this->get_config('twitter_config_https_len'));
 
+            // Hide shorten url input, if no url shorter is used!
+            if ('raw' == $this->get_config('anounce_url_service','7ax.de')) {
+                echo "<style type=\"text/css\">div#serendipity_admin_tweeter_shorturl {display: none;}</style>";
+                @define('PLUGIN_EVENT_TWITTER_TWEETER_SHORTEN_OR_UPDATE',  PLUGIN_EVENT_TWITTER_TWEETER_UPDATE);
+            }
+            else {
+                @define('PLUGIN_EVENT_TWITTER_TWEETER_SHORTEN_OR_UPDATE',  PLUGIN_EVENT_TWITTER_TWEETER_SHORTEN . ' / ' . PLUGIN_EVENT_TWITTER_TWEETER_UPDATE);
+            }                
             // Display the form
             include dirname(__FILE__) . '/tweeter/tweeter_client.inc.php';
 

diff --git a/serendipity_plugin_twitter/tweeter/tweeter_client.inc.php b/serendipity_plugin_twitter/tweeter/tweeter_client.inc.php
@@ -25,8 +25,10 @@
 <input id="tweeter_change_identity" name="tweeter_change_identity" value="change" type="submit" /><br/>
 <?php echo PLUGIN_EVENT_TWITTER_TWEETER_FORM; ?><span id="tweeeter_charcount">140</span> <?php echo PLUGIN_EVENT_TWITTER_TWEETER_CHARSLEFT; ?>
  <textarea id="tweeter_tweet" rows="3" cols="40" id="tweet" name="tweet" onfocus="tweeter_char_count()" onkeydown="tweeter_char_count()" onkeyup="tweeter_char_count()" onkeypress="tweeter_char_count()"><?php if(isset($val_tweet)){ echo $val_tweet; } ?></textarea><br />
+ <div id="serendipity_admin_tweeter_shorturl">
  <label for="shorturl"><?php echo PLUGIN_EVENT_TWITTER_TWEETER_SHORTEN; ?>: </label><input type="text" id="shorturl" value="<?php echo empty($val_short) ? 'http://' : $val_short; ?>" name="shorturl"/><br />
- <input id="tweeter_submit" name="tweeter_submit" value="<?php echo PLUGIN_EVENT_TWITTER_TWEETER_SHORTEN; ?> / Update" type="submit" />
+ </div>
+ <input id="tweeter_submit" name="tweeter_submit" value="<?php echo PLUGIN_EVENT_TWITTER_TWEETER_SHORTEN_OR_UPDATE; ?>" type="submit" />
 </form>
 <?php if(isset($notice)) echo $notice; ?>
 <script type="text/javascript">