Changeset 24757 for extensions/SocialButtons/include

Timestamp:

Oct 4, 2013, 10:09:05 PM (11 years ago)

Author:

mistic100

Message:

add light mode: no script loaded
tests in migration task
add an id to the div on picture page

Location:

extensions/SocialButtons/include

Files:

• install.inc.php (modified) (5 diffs)
• pinterest.inc.php (modified) (1 diff)
• twitter.inc.php (modified) (1 diff)

extensions/SocialButtons/include/install.inc.php

@@ -11 +11 @@
       'position' => 'toolbar',
       'on_index' => true,
+      'light' => false,
       'twitter' => array(
         'enabled' => true,
@@ -42 +43 @@
     {
       $temp = is_string($conf['TumblrShare']) ? unserialize($conf['TumblrShare']) : $conf['TumblrShare'];
-      $default_config['tumblr']['type'] = $temp['type'];
-      $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['tumblr']['img_size'] = $temp['img_size'];
     }
     if (isset($conf['TweetThis']))
     {
       $temp = is_string($conf['TweetThis']) ? unserialize($conf['TweetThis']) : $conf['TweetThis'];
-      $default_config['twitter']['size'] = $temp['size'];
-      $default_config['twitter']['count'] = $temp['count'] ? 'bubble' : 'none';
-      $default_config['twitter']['via'] = $temp['via'];
+      if (!empty($temp['type']))  $default_config['twitter']['size'] =  $temp['size'];
+      if (!empty($temp['count'])) $default_config['twitter']['count'] = $temp['count'] ? 'bubble' : 'none';
+      if (!empty($temp['via']))   $default_config['twitter']['via'] =   $temp['via'];
     }
     if (isset($conf['GooglePlusOne']))
     {
       $temp = is_string($conf['GooglePlusOne']) ? unserialize($conf['GooglePlusOne']) : $conf['GooglePlusOne'];
-      $default_config['google']['size'] = $temp['size'];
-      $default_config['google']['annotation'] = $temp['annotation'];
+      if (!empty($temp['size']))        $default_config['google']['size'] =       $temp['size'];
+      if (!empty($temp['annotation']))  $default_config['google']['annotation'] = $temp['annotation'];
     }
     
@@ -64 +65 @@
   else
   {
-    $new_conf = unserialize($conf['SocialButtons']);
+    $new_conf = is_string($conf['SocialButtons']) ? unserialize($conf['SocialButtons']) : $conf['SocialButtons'];
     
     if (empty($new_conf['pinterest']))
@@ -74 +75 @@
         );
     }
+    
     if (!isset($new_conf['on_index']))
     {
@@ -84 +86 @@
     }
     
+    if (!isset($new_conf['light']))
+    {
+      $new_conf['light'] = false;
+    }
+    
     $conf['SocialButtons'] = serialize($new_conf);
     conf_update_param('SocialButtons', $conf['SocialButtons']);

extensions/SocialButtons/include/pinterest.inc.php

@@ -4 +4 @@
 function socialbutt_pinterest($basename, $root_url, &$tpl_vars, &$buttons)
 {
-  // only on piture page
+  // only on picture page
   if ($basename != 'picture')
   {

extensions/SocialButtons/include/twitter.inc.php

@@ -6 +6 @@
   global $conf, $template, $user;
   
- $twitter_langs = array(
+  $twitter_langs = array(
     'fr','en','ar','ja','es','de','it','id','pt','ko','tr','ru','nl','fil','msa','zh-tw',
     'zh-cn','hi','no','sv','fi','da','pl','hu','fa','he','ur','th','uk','ca','el','eu','cs'