Changeset 16310 for extensions/GooglePlusOne

Timestamp:

Jul 2, 2012, 11:54:13 PM (12 years ago)

Author:

mistic100

Message:

another fix for stripped

Location:

extensions/GooglePlusOne

Files:

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

extensions/GooglePlusOne/main.inc.php

@@ -28 +28 @@
     'ro','ru','sr','sk','sl','es','sv','th','tr','uk','vi',
     );
-    
-  $template->assign(array(
-    'GPLUS1_SIZE' => $conf['GooglePlusOne']['size'],
-    'GPLUS1_ANNO' => $conf['GooglePlusOne']['annotation'],
-  ));
   
-  if (script_basename() == 'picture')
+  // position for index
+  if (script_basename() == 'index')
   {
-    $template->assign('GPLUS1_POSITON', $conf['GooglePlusOne']['position']);
-    $template->set_prefilter('picture', 'gplus1_add_button_prefilter');
-  }
-  else if (script_basename() == 'index')
-  {
-    $template->assign('GPLUS1_POSITON', 'index');
-    $template->set_prefilter('index', 'gplus1_add_button_prefilter');
+    $conf['GooglePlusOne']['position'] = 'index';
   }
   
@@ -50 +40 @@
     if ($conf['GooglePlusOne']['size'] == 'tall' AND $conf['GooglePlusOne']['annotation'] == 'bubble')
     {
-        $template->assign('GPLUS1_SIZE', 'standard');
+      $conf['GooglePlusOne']['size'] = 'standard';
     }
   }
+  
+  // config
+  $template->assign(array(
+    'GPLUS1_SIZE' => $conf['GooglePlusOne']['size'],
+    'GPLUS1_ANNO' => $conf['GooglePlusOne']['annotation'],
+    'GPLUS1_POSITON' => $conf['GooglePlusOne']['position'],
+  ));
   
   // button language
@@ -67 +64 @@
     $template->assign('GPLUS1_LANG', 'en-GB');
   }
+  
+  
+  $template->set_filename('gplus1_button', dirname(__FILE__).'/button.tpl');
+  $button = $template->parse('gplus1_button', true);
+  
+  switch ($conf['GooglePlusOne']['position'])
+  {
+    case 'index':
+      $template->concat('PLUGIN_INDEX_ACTIONS', '<li>'.$button.'</li>');
+      break;
+    case 'toolbar':
+      $template->concat('PLUGIN_PICTURE_ACTIONS', $button);
+      break;
+    default;
+      $template->assign('GPLUS1_BUTTON', $button);
+      $template->set_prefilter('picture', 'gplus1_add_button_prefilter');
+  }
 }
 
@@ -73 +87 @@
   global $template;
   
-  $replace = '{combine_script id=\'google_plusone\' path=\'https://apis.google.com/js/plusone.js\'}
-<script type="text/javascript">window.___gcfg = {ldelim}lang: \'{$GPLUS1_LANG}\'};</script>
-<g:plusone size="{$GPLUS1_SIZE}" annotation="{$GPLUS1_ANNO}"></g:plusone>';
-  
   switch ($template->get_template_vars('GPLUS1_POSITON'))
   {
     case 'top':
       $search = '<div id="theImage">';
-      $replace = '<div>'.$replace.'</div>';
+      $replace = '<div>{$GPLUS1_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 = '{$GPLUS1_BUTTON}';
       break;
   }