Changeset 24788 for extensions/SocialButtons/include

Timestamp:

Oct 6, 2013, 9:05:18 PM (11 years ago)

Author:

mistic100

Message:

improve facebook light link and clean code & conf

Location:

extensions/SocialButtons/include

Files:

• install.inc.php (modified) (6 diffs)
• pinterest.inc.php (modified) (1 diff)
• reddit.inc.php (modified) (1 diff)
• tumblr.inc.php (modified) (1 diff)

extensions/SocialButtons/include/install.inc.php

@@ -11 +11 @@
       'position' => 'toolbar',
       'on_index' => true,
+      'img_size' => 'Original',
       'light' => false,
       'twitter' => array(
@@ -26 +27 @@
         'enabled' => true,
         'type' => 'share_1',
-        'img_size' => 'Original',
         ),
       'facebook' => array(
@@ -36 +36 @@
         'enabled' => true,
         'layout' => 'horizontal',
-        'img_size' => 'Original',
         ),
       'reddit' => array(
@@ -48 +47 @@
     {
       $temp = is_string($conf['TumblrShare']) ? unserialize($conf['TumblrShare']) : $conf['TumblrShare'];
-      if (!empty($temp['type']))      $default_config['tumblr']['type'] =     $temp['type'];
-      if (!empty($temp['img_size']))  $default_config['tumblr']['img_size'] = $temp['img_size'];
+      if (!empty($temp['type']))      $default_config['tumblr']['type'] = $temp['type'];
+      if (!empty($temp['img_size']))  $default_config['img_size'] =       $temp['img_size'];
     }
     if (isset($conf['TweetThis']))
@@ -77 +76 @@
         'enabled' => true,
         'layout' => 'horizontal',
-        'img_size' => 'Original',
         );
     }
@@ -105 +103 @@
     }
     
+    if (!isset($new_conf['img_size']))
+    {
+      $new_conf['img_size'] = isset($new_conf['tumblr']['img_size']) ? $new_conf['tumblr']['img_size'] : 'Original';
+      unset($new_conf['tumblr']['img_size'], $new_conf['pinterest']['img_size']);
+    }
+    
     $conf['SocialButtons'] = serialize($new_conf);
     conf_update_param('SocialButtons', $conf['SocialButtons']);

extensions/SocialButtons/include/pinterest.inc.php

@@ -10 +10 @@
   }
   
-  global $conf, $template, $picture;
+  global $conf, $template;
   
   // config
   $tpl_vars['PINTEREST'] = $conf['SocialButtons']['pinterest'];
-  $tpl_vars['PINTEREST']['title'] = $picture['current']['TITLE'];
-  
-  if ($conf['SocialButtons']['pinterest']['img_size'] == 'Original')
-  {
-    $tpl_vars['PINTEREST']['source'] = $picture['current']['src_image']->get_url();
-  }
-  else
-  {
-    $tpl_vars['PINTEREST']['source'] = DerivativeImage::url($conf['SocialButtons']['pinterest']['img_size'], $picture['current']['src_image']);
-  }
-  
   
   $template->set_filename('pinterest_button', realpath(SOCIALBUTT_PATH .'template/pinterest.tpl'));

extensions/SocialButtons/include/reddit.inc.php

@@ -19 +19 @@
     $conf['SocialButtons']['reddit']['type'] = 'spreddit7';
   }
+  
   
   // config

extensions/SocialButtons/include/tumblr.inc.php

@@ -9 +9 @@
   $tpl_vars['TUMBLR'] = $conf['SocialButtons']['tumblr'];
   
-  // button on piture page
-  if ($basename == 'picture')
-  {
-    global $picture;
-    
-    $tpl_vars['TUMBLR']['mode'] = 'photo';
-    $tpl_vars['TUMBLR']['title'] = $picture['current']['TITLE'];
-    
-    if ($conf['SocialButtons']['tumblr']['img_size'] == 'Original')
-    {
-      $tpl_vars['TUMBLR']['source'] = $picture['current']['src_image']->get_url();
-    }
-    else
-    {
-      $tpl_vars['TUMBLR']['source'] = DerivativeImage::url($conf['SocialButtons']['tumblr']['img_size'], $picture['current']['src_image']);
-    }
-  }
-  // button on other pages
-  else if ($basename == 'index')
-  {
-    global $page;
-    
-    $tpl_vars['TUMBLR']['mode'] = 'link';
-    $tpl_vars['TUMBLR']['title'] = strip_tags($page['title']);
-  }
-  
-  
   $template->set_filename('tumblr_button', realpath(SOCIALBUTT_PATH .'template/tumblr.tpl'));
   $buttons[] = 'tumblr_button';