Changeset 16309

Timestamp:

Jul 2, 2012, 11:53:27 PM (12 years ago)

Author:

mistic100

Message:

another fix for stripped

Location:

extensions/TweetThis

Files:

• button.tpl (added)
• main.inc.php (modified) (3 diffs)

extensions/TweetThis/main.inc.php

@@ -28 +28 @@
     );
   
+  // urls and position for index
+  if (script_basename() == 'picture')
+  {
+    $template->assign('TWEET_URL', get_absolute_root_url().duplicate_picture_url());
+  }
+  else if (script_basename() == 'index')
+  {
+    $conf['TweetThis']['position'] = 'index';
+    $template->assign('TWEET_URL', get_absolute_root_url().duplicate_index_url());
+  }
+  
+  // config
   $template->assign(array(
+    'TWEET_POSITION' => $conf['TweetThis']['position'],
     'TWEET_SIZE' => $conf['TweetThis']['size'],
     'TWEET_COUNT' => $conf['TweetThis']['count'],
     'TWEET_VIA' => $conf['TweetThis']['via'],
   ));
-  
-  if (script_basename() == 'picture')
-  {
-    $template->assign('TWEET_POSITON', $conf['TweetThis']['position']);
-    $template->assign('TWEET_URL', get_absolute_root_url().duplicate_picture_url());
-    $template->set_prefilter('picture', 'tweet_add_button_prefilter');
-  }
-  else if (script_basename() == 'index')
-  {
-    $template->assign('TWEET_POSITON', 'index');
-    $template->assign('TWEET_URL', get_absolute_root_url().duplicate_index_url());
-    $template->set_prefilter('index', 'tweet_add_button_prefilter');
-  }
   
   // button language
@@ -60 +60 @@
     $template->assign('TWEET_LANG', 'en');
   }
+  
+  
+  $template->set_filename('tweet_button', dirname(__FILE__).'/button.tpl');
+  $button = $template->parse('tweet_button', true);
+  
+  switch ($conf['TweetThis']['position'])
+  {
+    case 'index':
+      $template->concat('PLUGIN_INDEX_ACTIONS', '<li>'.$button.'</li>');
+      break;
+    case 'toolbar':
+      $template->concat('PLUGIN_PICTURE_ACTIONS', $button);
+      break;
+    default;
+      $template->assign('TWEET_BUTTON', $button);
+      $template->set_prefilter('picture', 'tweet_add_button_prefilter');
+  }
 }
 
@@ -66 +83 @@
   global $template;
   
-  $replace = '{combine_script id=\'twitter_widgets\' path=\'http://platform.twitter.com/widgets.js}
-  <a href="https://twitter.com/share" class="twitter-share-button" 
-    data-url="{$TWEET_URL}" data-lang="{$TWEET_LANG}" {if not empty($TWEET_VIA)}data-via="{$TWEET_VIA}"{/if} 
-    {if $TWEET_SIZE=="large"}data-size="large"{/if} {if not $TWEET_COUNT}data-count="none"{/if}>Tweet</a>';
   switch ($template->get_template_vars('TWEET_POSITON'))
   {
     case 'top':
       $search = '<div id="theImage">';
-      $replace = '<div>'.$replace.'</div>';
+      $replace = '<div>{$TWEET_BUTTON}</div>';
       break;
       
     case 'bottom':
       $search = '{$ELEMENT_CONTENT}';
-      break;
-      
-    case 'toolbar':
-      $search = '<div class="actionButtons">';
-      break;
-      
-    case 'index':  
-      $search = '<ul class="categoryActions">';
-      $replace = '<li>'.$replace.'</li>';
+      $replace = '{$TWEET_BUTTON}';
       break;
   }