Corrects encoding and other small tweaks in Twitter widget

diff --git a/mod/twitter/languages/en.php b/mod/twitter/languages/en.php
index 29700744aadbdedde301f1baa5c9a8a693c06025..11e745ba19210310c9be44ef9ebf3bfa0489571e 100644 (file)
--- a/mod/twitter/languages/en.php
+++ b/mod/twitter/languages/en.php
@@ -4,13 +4,14 @@
  */
 
 $english = array(
-
        'twitter:title' => 'Twitter',
        'twitter:info' => 'Display your latest tweets',
-       'twitter:username' => 'Enter your twitter username.',
-       'twitter:num' => 'The number of tweets to show.',
+       'twitter:username' => 'Your twitter username',
+       'twitter:num' => 'Number of tweets to show*',
        'twitter:visit' => 'visit my twitter',
-       'twitter:notset' => 'This Twitter widget is not yet set to go. To display your latest tweets, click on - edit - and fill in your details',
+       'twitter:notset' => 'This widget needs to be configured. To display your latest tweets, click the customize icon and fill in your Twitter username.',
+       'twitter:invalid' => 'This widget is configured with an invalid Twitter username. Click the customize icon to correct it.',
+       'twitter:apibug' => "*Due to a bug in the Twitter 1.0 API, you may see fewer tweets than you ask for.",
 );
 
 add_translation("en", $english);

diff --git a/mod/twitter/views/default/widgets/twitter/content.php b/mod/twitter/views/default/widgets/twitter/content.php
index c616d944cfb6b0abcd0b8c2058056eca9cf5d028..dd741745eae6aae764c5704e55781bc9d5c28ec5 100644 (file)
--- a/mod/twitter/views/default/widgets/twitter/content.php
+++ b/mod/twitter/views/default/widgets/twitter/content.php
@@ -6,26 +6,39 @@
  * @package ElggTwitter
  */
 
-//some required params
-
 $username = $vars['entity']->twitter_username;
+
+if (empty($username)) {
+       echo "<p>" . elgg_echo("twitter:notset") . "</p>";
+       return;
+}
+
+$username_is_valid = preg_match('~^[a-zA-Z0-9_]{1,20}$~', $username);
+
+if (!$username_is_valid) {
+       echo "<p>" . elgg_echo("twitter:invalid") . "</p>";
+       return;
+}
+
+
+
 $num = $vars['entity']->twitter_num;
+if (empty($num)) {
+       $num = 5;
+}
 
-// if the twitter username is empty, then do not show
-if ($username) {
+// @todo upgrade to 1.1 API https://dev.twitter.com/docs/api/1.1/get/statuses/home_timeline
+$script_url = "https://api.twitter.com/1/statuses/user_timeline/" . urlencode($username) . ".json"
+            . "?callback=twitterCallback2&count=" . (int) $num;
 
 ?>
-
 <div id="twitter_widget">
        <ul id="twitter_update_list"></ul>
-       <p class="visit_twitter"><a href="http://twitter.com/<?php echo $username; ?>"><?php echo elgg_echo("twitter:visit"); ?></a></p>
+       <p class="visit_twitter"><?php echo elgg_view('output/url', array(
+               'text' => elgg_echo("twitter:visit"),
+               'href' => 'http://twitter.com/' . urlencode($username),
+               'is_trusted' => true,
+       )) ?></p>
        <script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
-       <script type="text/javascript" src="https://api.twitter.com/1/statuses/user_timeline/<?php echo $username; ?>.json?callback=twitterCallback2&count=<?php echo $num; ?>"></script>
+       <script type="text/javascript" src="<?php echo htmlspecialchars($script_url, ENT_QUOTES, 'UTF-8') ?>"></script>
 </div>
-
-<?php
-} else {
-
-       echo "<p>" . elgg_echo("twitter:notset") . ".</p>";
-
-}

diff --git a/mod/twitter/views/default/widgets/twitter/edit.php b/mod/twitter/views/default/widgets/twitter/edit.php
index 5da3a7e55ca764fcbb60df4afb58ddeb4c282c67..5dd291257c82f34605542dac5f8f853664059471 100644 (file)
--- a/mod/twitter/views/default/widgets/twitter/edit.php
+++ b/mod/twitter/views/default/widgets/twitter/edit.php
@@ -1,16 +1,26 @@
 <?php
 
-    /**
-        * Elgg twitter edit page
-        *
-        * @package ElggTwitter
-        */
+/**
+ * Elgg twitter edit page
+ *
+ * @package ElggTwitter
+ */
 
 ?>
-       <p>
-               <?php echo elgg_echo("twitter:username"); ?>
-               <input type="text" name="params[twitter_username]" value="<?php echo htmlentities($vars['entity']->twitter_username); ?>" />    
-               <br /><?php echo elgg_echo("twitter:num"); ?>
-               <input type="text" name="params[twitter_num]" value="<?php echo htmlentities($vars['entity']->twitter_num); ?>" />      
-       
-       </p>
\ No newline at end of file
+<p>
+       <label><?php echo elgg_echo("twitter:username"); ?>
+       <?php echo elgg_view('input/text', array(
+               'name' => 'params[twitter_username]',
+               'value' => $vars['entity']->twitter_username,
+       )) ?>
+       </label>
+</p>
+<p>
+       <label><?php echo elgg_echo("twitter:num"); ?>
+       <?php echo elgg_view('input/text', array(
+               'name' => 'params[twitter_num]',
+               'value' => $vars['entity']->twitter_num,
+       )) ?>
+       </label>
+       <small style="font-size:.9em"><?php echo elgg_echo("twitter:apibug") ?></small>
+</p>
\ No newline at end of file