delete service google plus and update register reddit

README.md

@@ -8,4 +8,4 @@
 
 I do not develop for Piwigo anymore thus I do not maintain this project. I will continue to release new versions containing new translations et any submitted merge requests.
 
-If you want to continue working on the plugin, please open a ticket, I can transfer you the ownership of the repository and the plugin page on http://piwigo.org/ext/
+If you want to continue working on the plugin, please open a ticket, I can transfer you the ownership of the repository and the plugin page on http://piwigo.org/ext/

admin.php

@@ -19,11 +19,6 @@
       'count' => $_POST['twitter']['count'],
       'via' => trim($_POST['twitter']['via']),
       ),
-    'google' => array(
-      'enabled' => isset($_POST['google']['enabled']),
-      'size' => $_POST['google']['size'],
-      'annotation' => $_POST['google']['annotation'],
-      ),
     'tumblr' => array(
       'enabled' => isset($_POST['tumblr']['enabled']),
       'type' => $_POST['tumblr']['type'],

main.inc.php

@@ -2,7 +2,7 @@
 /*
 Plugin Name: Social Buttons
 Version: auto
-Description: Sharing functions for Facebook, Twitter, Google+ and Tumblr
+Description: Sharing functions for Facebook, Twitter and Tumblr
 Plugin URI: auto
 Author: Mistic
 Author URI: http://www.strangeplanet.fr

maintain.class.php

@@ -14,11 +14,6 @@ class SocialButtons_maintain extends PluginMaintain
       'count' => 'bubble',
       'via' => null,
       ),
-    'google' => array(
-      'enabled' => true,
-      'size' => 'medium',
-      'annotation' => 'bubble',
-      ),
     'tumblr' => array(
       'enabled' => true,
       'type' => 'share_1',
@@ -62,19 +57,6 @@ function install($plugin_version, &$errors=array())
         if (!empty($temp['count'])) $this->default_config['twitter']['count'] = $temp['count'] ? 'bubble' : 'none';
         if (!empty($temp['via']))   $this->default_config['twitter']['via'] =   $temp['via'];
       }
-      if (isset($conf['GooglePlusOne']))
-      {
-        $temp = safe_unserialize($conf['GooglePlusOne']);
-        if (!empty($temp['size']))        $this->default_config['google']['size'] =       $temp['size'];
-        if (!empty($temp['annotation']))  $this->default_config['google']['annotation'] = $temp['annotation'];
-      }
-
-      conf_update_param('SocialButtons', $this->default_config, true);
-    }
-    else
-    {
-      $new_conf = safe_unserialize($conf['SocialButtons']);
-
       if (empty($new_conf['pinterest']))
       {
         $new_conf['pinterest'] = array(

template/admin.tpl

@@ -2,9 +2,9 @@
 
 {html_style}
 .socialbutt.disabled thead img {
-  -webkit-filter: grayscale(100%); /* Chrome 19+ & Safari 6+ */
-  filter: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><filter id='grayscale'><feColorMatrix type='saturate' values='0'/></filter></svg>#grayscale"); /* Firefox 10+ */
-  filter: gray; /* IE6-9 */
+  -webkit-filter: grayscale(100%);
+  filter: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><filter id='grayscale'><feColorMatrix type='saturate' values='0'/></filter></svg>#grayscale");
+  filter: gray;
 }
 {if $light}
 .not-light { display:none; }
@@ -144,56 +144,6 @@ jQuery(".showInfo").tipTip({
 </table>
 </div> {* <!-- twitter --> *}
 
-<div class="socialbutt {if not $google.enabled}disabled{else}enabled{/if}"> {* <!-- google --> *}
-<table>
-  <thead>
-    <tr><td colspan="2">
-      <label title="{if $google.enabled}{'Disable'|translate}{else}{'Enable'|translate}{/if}">
-        <img src="{$SOCIALBUTT_PATH}template/images/google_logo.png"/>
-        <input class="enable" style="display:none;" type="checkbox" name="google[enabled]" {if $google.enabled}checked="checked"{/if}/>
-      </label>
-    </td></tr>
-  </thead>
-  <tbody>
-    <tr class="property">
-      <td>
-        {'Button type'|translate}
-      </td>
-      <td></td>
-    </tr>
-    <tr class="button">
-      <td><label>
-        <img src="{$SOCIALBUTT_PATH}template/images/google_small.png"/>
-        <input type="radio" name="google[size]" value="small" {if $google.size=='small'}checked="checked"{/if}/>
-      </label></td>
-      <td><label>
-        <input type="radio" name="google[size]" value="medium" {if $google.size=='medium'}checked="checked"{/if}/>
-        <img src="{$SOCIALBUTT_PATH}template/images/google_medium.png"/>
-      </label></td>
-    </tr>
-    <tr class="button">
-      <td><label>
-        <img src="{$SOCIALBUTT_PATH}template/images/google_standard.png"/>
-        <input type="radio" name="google[size]" value="standard" {if $google.size=='standard'}checked="checked"{/if}/>
-      </label></td>
-      <td><label>
-        <input type="radio" name="google[size]" value="tall" {if $google.size=='tall'}checked="checked"{/if}/>
-        <img src="{$SOCIALBUTT_PATH}template/images/google_tall.png"/>
-      </label></td>
-    </tr>
-    <tr class="property not-light">
-      <td>
-        {'Annotation'|translate}
-      </td>
-      <td>
-        <label><input type="radio" name="google[annotation]" value="none" {if $google.annotation=='none'}checked="checked"{/if}/> {'None'|translate}</label><br>
-        <label><input type="radio" name="google[annotation]" value="bubble" {if $google.annotation=='bubble'}checked="checked"{/if}/> {'Bubble'|translate}</label><br>
-        <label><input type="radio" name="google[annotation]" value="inline" {if $google.annotation=='inline'}checked="checked"{/if}/> {'Inline text'|translate}</label>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</div> {* <!-- google --> *}
 
 <br>
 
@@ -212,7 +162,7 @@ jQuery(".showInfo").tipTip({
       <td>
         {'Annotation'|translate}
       </td>
-      <td>
+
         <!-- <label><input type="radio" name="facebook[layout]" value="none" {if $facebook.layout=='none'}checked="checked"{/if}/> {'None'|translate}</label><br> -->
         <label><input type="radio" name="facebook[layout]" value="button_count" {if $facebook.layout=='button_count'}checked="checked"{/if}/> {'Right bubble'|translate}</label><br>
         <label><input type="radio" name="facebook[layout]" value="box_count" {if $facebook.layout=='box_count'}checked="checked"{/if}/> {'Top bubble'|translate}</label><br>

template/reddit.tpl

@@ -8,7 +8,7 @@
   </script>
   <script type="text/javascript" src="https://{$SOCIALBUTT.REDDIT.lang}.reddit.com/static/button/button1.js"></script>
 {else}
-  <a title="Share on reddit" href="https://{$SOCIALBUTT.REDDIT.lang}.reddit.com/submit?url={$SOCIALBUTT.share_url|urlencode}&title={$PAGE_TITLE|cat:' | '|cat:$GALLERY_TITLE|urlencode}&target={$SOCIALBUTT.REDDIT.community|urlencode}" rel="nofollow" target="_blank">
+  <a title="Share on reddit" href="https://{$SOCIALBUTT.REDDIT.lang}.reddit.com/register?url={$SOCIALBUTT.share_url|urlencode}&title={$PAGE_TITLE|cat:' | '|cat:$GALLERY_TITLE|urlencode}&target={$SOCIALBUTT.REDDIT.community|urlencode}" rel="nofollow" target="_blank">
     <img src="https://www.reddit.com/static/{$SOCIALBUTT.REDDIT.type}.gif" alt="reddit"></a>
 {/if}
-{/strip}
+{/strip}