Changeset 15121 for extensions/GooglePlusOne/main.inc.php

Timestamp:

May 19, 2012, 1:11:01 PM (12 years ago)

Author:

mistic100

Message:

update for Piwigo 2.4
change previews with new G+1 appearance
add Annotation parameter

File:

• extensions/GooglePlusOne/main.inc.php (modified) (4 diffs)

extensions/GooglePlusOne/main.inc.php

@@ -22 +22 @@
   global $conf, $template, $user;
   
-  $conf['GooglePlusOne'] = explode(',', $conf['GooglePlusOne']);
+  $conf['GooglePlusOne'] = unserialize($conf['GooglePlusOne']);
   $conf['GooglePlusOne']['lang'] = array(
-    'ar','bg','ca','hr','cs','da','nl','et','fi','fr','de','el','iw','hi',
-    'hu','id','it','ja','ko','lv','lt','ms','no','fa','pl','ro','ru','sr',
-    'sk','sl','es','sv','th','tr','uk','vi'
+    'ar','bg','ca','zh-CN','zh-TW','hr','cs','da','nl','en-US','en-GB','et','fi','fr','de',
+    'el','iw','hi','hu','id','it','ja','ko','lv','lt','ms','no','fa','pl','pt-BR','pt-PT',
+    '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')
   {
-    $template->assign(array(
-      'GPLUS1_SIZE' => $conf['GooglePlusOne'][0],
-      'GPLUS1_POSITON' => $conf['GooglePlusOne'][1],
-    ));
-        
+    $template->assign('GPLUS1_POSITON', $conf['GooglePlusOne']['position']);
     $template->set_prefilter('picture', 'gplus1_add_button_prefilter');
   }
   else if (script_basename() == 'index')
   {
-    $template->assign(array(
-      'GPLUS1_SIZE' => $conf['GooglePlusOne'][0],
-      'GPLUS1_POSITON' => 'index',
-    ));
-        
+    $template->assign('GPLUS1_POSITON', 'index');
     $template->set_prefilter('index', 'gplus1_add_button_prefilter');
   }
   
   // if the link is in the toolbar, we must use smallier buttons
-  if ( script_basename() == 'index' OR  $conf['GooglePlusOne'][1] == 'toolbar')
+  if ( script_basename() == 'index' OR  $conf['GooglePlusOne']['position'] == 'toolbar')
   {
-    if ($conf['GooglePlusOne'][0] == 'tall')
+    if ($conf['GooglePlusOne']['size'] == 'tall' AND $conf['GooglePlusOne']['annotation'] == 'bubble')
     {
         $template->assign('GPLUS1_SIZE', 'standard');
@@ -58 +55 @@
   
   // button language
+  if ( in_array(str_replace('_','-',$user['language']), $conf['GooglePlusOne']['lang']) )
+  {
+    $template->assign('GPLUS1_LANG', str_replace('_','-',$user['language']));
+  }
   if ( in_array(substr($user['language'],0,2), $conf['GooglePlusOne']['lang']) )
   {
@@ -72 +73 @@
   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><g:plusone size="{$GPLUS1_SIZE}"></g:plusone></div>';
+      $replace = '<div>'.$replace.'</div>';
       break;
       
     case 'bottom':
       $search = '{$ELEMENT_CONTENT}';
-      $replace = '<g:plusone size="{$GPLUS1_SIZE}"></g:plusone>';
       break;
       
     case 'toolbar':
-      $search = '{*caddie management END*}';
-      $replace = '<g:plusone size="{$GPLUS1_SIZE}"></g:plusone>';
+      $search = '<div class="actionButtons">';
       break;
       
     case 'index':  
       $search = '<ul class="categoryActions">';
-      $replace = '<li><g:plusone size="{$GPLUS1_SIZE}"></g:plusone></li>';
+      $replace = '<li>'.$replace.'</li>';
       break;
   }
-  $replace = $search.$replace.'
-{combine_script id=\'google_plusone\' path=\'https://apis.google.com/js/plusone.js\'}
-<script type="text/javascript">{ldelim}lang: \'{$GPLUS1_LANG}\'}</script>';
 
-  return str_replace($search, $replace, $content);
+  return str_replace($search, $search.$replace, $content);
 }
 
@@ -108 +108 @@
   function gplus1_plugin_admin_menu($menu)
   {
-    array_push(
-      $menu,
-      array(
-        'NAME' => 'Google+1',
-        'URL' => get_root_url().'admin.php?page=plugin-'.basename(dirname(__FILE__))
-        )
-      );
-    
+    array_push($menu, array(
+      'NAME' => 'Google+1',
+      'URL' => get_root_url().'admin.php?page=plugin-'.basename(dirname(__FILE__))
+      ));
     return $menu;
   }